mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-07-16 12:10:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

wifi: mac80211: add NAN peer schedule support

Browse Source 
Peer schedules specify which channels the peer is available on and when.
Add support for configuring peer NAN schedules:
- build and store the schedule and maps
- for each channel, make sure that it fits into the capabilities, and
  take the minimum between it and the local compatible nan channel.
- configure the driver

Note that the removal of a peer schedule should be done by the driver
upon NMI station removal.

Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20260326121156.185ff2283fa6.I0345eb665be8ccf4a77eb1aca9a421eb8d2432e2@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Miri Korenblit
2026-03-26 12:14:39 +02:00
committed by Johannes Berg
parent 27e9b326b6
commit 840492bf33
8 changed files with 365 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
include/net/mac80211.h
View File

@@ -877,8 +877,11 @@ struct ieee80211_bss_conf {
* is irrelevant for NAN, still store it for convenience - some functions
* require it as an argument.
* @needed_rx_chains: number of RX chains needed for this NAN channel
* @chanctx_conf: chanctx_conf assigned to this NAN channel. Will be %NULL
* if the channel is ULWed.
* @chanctx_conf: chanctx_conf assigned to this NAN channel.
* If a local channel is being ULWed (because we needed this chanctx for
* something else), the local NAN channel that used this chanctx,
* will have this pointer set to %NULL.
* A peer NAN channel should never have this pointer set to %NULL.
* @channel_entry: the Channel Entry blob as defined in Wi-Fi Aware
* (TM) 4.0 specification Table 100 (Channel Entry format for the NAN
* Availability attribute).
@@ -890,6 +893,49 @@ struct ieee80211_nan_channel {
u8 channel_entry[6];
};
/**
* struct ieee80211_nan_peer_map - NAN peer schedule map
*
* This stores a single map from a peer's schedule. Each peer can have
* multiple maps.
*
* @map_id: the map ID from the peer schedule, %CFG80211_NAN_INVALID_MAP_ID
* if unused
* @slots: mapping of time slots to channel configurations in the schedule's
* channels array
*/
struct ieee80211_nan_peer_map {
u8 map_id;
struct ieee80211_nan_channel *slots[CFG80211_NAN_SCHED_NUM_TIME_SLOTS];
};
/**
* struct ieee80211_nan_peer_sched - NAN peer schedule
*
* This stores the complete schedule from a peer. Contains peer-level
* parameters and an array of schedule maps.
*
* @seq_id: the sequence ID from the peer schedule
* @committed_dw: committed DW as published by the peer
* @max_chan_switch: maximum channel switch time in microseconds
* @init_ulw: initial ULWs as published by the peer (copied)
* @ulw_size: number of bytes in @init_ulw
* @maps: array of peer schedule maps. Invalid slots have map_id set to
* %CFG80211_NAN_INVALID_MAP_ID.
* @n_channels: number of valid channel entries in @channels
* @channels: flexible array of negotiated peer channels for this schedule
*/
struct ieee80211_nan_peer_sched {
u8 seq_id;
u16 committed_dw;
u16 max_chan_switch;
const u8 *init_ulw;
u16 ulw_size;
struct ieee80211_nan_peer_map maps[CFG80211_NAN_MAX_PEER_MAPS];
u8 n_channels;
struct ieee80211_nan_channel channels[] __counted_by(n_channels);
};
/**
* enum mac80211_tx_info_flags - flags to describe transmission information/status
*
@@ -2625,6 +2671,7 @@ struct ieee80211_link_sta {
* @spp_amsdu: indicates whether the STA uses SPP A-MSDU or not.
* @epp_peer: indicates that the peer is an EPP peer.
* @nmi: For NDI stations, pointer to the NMI station of the peer.
* @nan_sched: NAN peer schedule for this station. Valid only for NMI stations.
*/
struct ieee80211_sta {
u8 addr[ETH_ALEN] __aligned(2);
@@ -2655,6 +2702,9 @@ struct ieee80211_sta {
struct ieee80211_sta __rcu *nmi;
/* should only be accessed with the wiphy mutex held */
struct ieee80211_nan_peer_sched *nan_sched;
/* must be last */
u8 drv_priv[] __aligned(sizeof(void *));
};
@@ -4556,6 +4606,12 @@ struct ieee80211_prep_tx_info {
* @del_nan_func: Remove a NAN function. The driver must call
* ieee80211_nan_func_terminated() with
* NL80211_NAN_FUNC_TERM_REASON_USER_REQUEST reason code upon removal.
* @nan_peer_sched_changed: Notifies the driver that the peer NAN schedule
* has changed. The new schedule is available via sta->nan_sched.
* Note that the channel_entry blob might not match the actual chandef
* since the bandwidth of the chandef is the minimum of the local and peer
* bandwidth. It is the driver responsibility to remove the peer schedule
* when the NMI station is removed.
* @can_aggregate_in_amsdu: Called in order to determine if HW supports
* aggregating two specific frames in the same A-MSDU. The relation
* between the skbs should be symmetric and transitive. Note that while
@@ -4961,6 +5017,8 @@ struct ieee80211_ops {
void (*del_nan_func)(struct ieee80211_hw *hw,
struct ieee80211_vif *vif,
u8 instance_id);
int (*nan_peer_sched_changed)(struct ieee80211_hw *hw,
struct ieee80211_sta *sta);
bool (*can_aggregate_in_amsdu)(struct ieee80211_hw *hw,
struct sk_buff *head,
struct sk_buff *skb);