nl80211: add support for BSS coloring
PATCH v2 1/3 nl80211: add support for BSS coloring
This patch adds support for BSS color collisions to the wireless subsystem. Add the required functionality to nl80211 that will notify about color collisions, triggering the color change and notifying when it is completed.
--- include/net/cfg80211.h | 64 ++++++++++++++ include/uapi/linux/nl80211.h | 43 +++++++++ net/wireless/nl80211.c | 164 +++++++++++++++++++++++++++++++++++ net/wireless/rdev-ops.h | 12 +++ net/wireless/trace.h | 60 +++++++++++++ 5 files changed, 343 insertions(+)
include/net/cfg80211.h +64 -0
@@ -1155,6 +1155,27 @@ struct cfg80211_csa_settings {u8 count; }; +/** +* struct cfg80211_cca_settings - color change settings +* +* Used for color change +* +* @beacon_cca: beacon data while performing the change +* @counter_offsets_beacon: offsets of the counters within the beacon (tail) +* @counter_offsets_presp: offsets of the counters within the probe response +* @beacon_after: beacon data to be used after the change +* @count: number of beacons until the change +* @color: the color that we will have after th change +*/ +struct cfg80211_cca_settings { +struct cfg80211_beacon_data beacon_cca; +u16 counter_offset_beacon; +u16 counter_offset_presp; +struct cfg80211_beacon_data beacon_after; +u8 count; +u8 color; +}; +#define CFG80211_MAX_NUM_DIFFERENT_CHANNELS 10/**
@@ -3795,6 +3816,7 @@ struct mgmt_frame_regs {* This callback may sleep. * @reset_tid_config: Reset TID specific configuration for the peer, for the * given TIDs. This callback may sleep. +* @color_change: initiate a color change (with CCA). */ struct cfg80211_ops {int (*suspend)(struct wiphy *wiphy,struct cfg80211_wowlan *wow);
@@ -4123,6 +4145,9 @@ struct cfg80211_ops { struct cfg80211_tid_config *tid_conf);int (*reset_tid_config)(struct wiphy *wiphy,struct net_device *dev,const u8 *peer,u8 tids); +int (*color_change)(struct wiphy *wiphy, +struct net_device *dev, +struct cfg80211_cca_settings *params); };/*
@@ -4172,6 +4197,7 @@ struct cfg80211_ops {* @WIPHY_FLAG_HAS_STATIC_WEP: The device supports static WEP key installation * before connection. * @WIPHY_FLAG_SUPPORTS_EXT_KEK_KCK: The device supports bigger kek and kck keys +* @WIPHY_FLAG_SUPPORTS_BSS_COLOR: Device supports BSS coloring */ enum wiphy_flags {WIPHY_FLAG_SUPPORTS_EXT_KEK_KCK =BIT (0 ),
@@ -4198,6 +4224,7 @@ enum wiphy_flags {WIPHY_FLAG_SUPPORTS_5_10_MHZ =BIT (22 ),WIPHY_FLAG_HAS_CHANNEL_SWITCH =BIT (23 ),WIPHY_FLAG_HAS_STATIC_WEP =BIT (24 ), + WIPHY_FLAG_SUPPORTS_BSS_COLOR = BIT(25), };/**
@@ -7882,4 +7909,41 @@ void cfg80211_update_owe_info_event(struct net_device *netdev,struct cfg80211_update_owe_info *owe_info, gfp_t gfp); +/** +* cfg80211_obss_color_collision_notify - notify about bss color collisions +* @dev: network device +* @color_bitmap: representations of the colors that the local BSS is aware of +*/ +void cfg80211_obss_color_collision_notify (struct net_device *dev, +u64 color_bitmap); + +/* +* cfg80211_color_change_started_notify - notify color change start +* @dev: the device on which the color is switched +* @count: the number of TBTTs until the color change happens +* +* Inform the userspace about the color change that has just +* started. +*/ +void cfg80211_color_change_started_notify (struct net_device *dev, +u8 count); + +/* +* cfg80211_color_change_aborted_notify - notify color change abort +* @dev: the device on which the color is switched +* +* Inform the userspace about the color change that has just +* started. +*/ +void cfg80211_color_change_aborted_notify (struct net_device *dev); + +/* +* cfg80211_color_change_notify - notify color change completion +* @dev: the device on which the color was switched +* +* Inform the userspace about the color change that has just +* completed. +*/ +void cfg80211_color_change_notify (struct net_device *dev); +#endif /* __NET_CFG80211_H */
include/uapi/linux/nl80211.h +43 -0
67 lines not on this page · raw message
net/wireless/nl80211.c +164 -0
188 lines not on this page · raw message
net/wireless/rdev-ops.h +12 -0
@@ -1356,4 +1356,16 @@ static inline int rdev_reset_tid_config(struct cfg80211_registered_device *rdev, return ret; } +static inline int rdev_color_change (struct cfg80211_registered_device *rdev, +struct net_device *dev, +struct cfg80211_cca_settings *params) +{ +int ret; + +trace_rdev_color_change (&rdev->wiphy, dev, params); + ret = rdev->ops->color_change (&rdev->wiphy, dev, params); +trace_rdev_return_int (&rdev->wiphy, ret); +return ret; +} +#endif /* __CFG80211_RDEV_OPS */
net/wireless/trace.h +60 -0
66 lines not on this page · raw message
Signature · 7 lines
2.25.1 -- ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
PATCH v2 2/3 mac80211: add support for BSS coloring
The CCA (color change announcement) is very similar to how CSA works where we have an IE that includes a counter. When the counter hits 0, the new color is applied via an updated beacon.
This patch makes the CSA counter functionality reusable, rather than implementing it again. This also allows for future reuse incase support for other counter IEs gets added.
--- include/net/mac80211.h | 58 ++++++++++ net/mac80211/cfg.c | 225 +++++++++++++++++++++++++++++++++++-- net/mac80211/ieee80211_i.h | 15 +++ net/mac80211/iface.c | 3 + net/mac80211/tx.c | 128 +++++++++++++++++---- 5 files changed, 402 insertions(+), 27 deletions(-)
include/net/mac80211.h +58 -0
@@ -1642,6 +1642,10 @@ enum ieee80211_vif_flags {* @txq: the multicast data TX queue (if driver uses the TXQ abstraction) * @txqs_stopped: per AC flag to indicate that intermediate TXQs are stopped, * protected by fq->lock. +* @cca_active: marks whether a color change is going on. Internally it is +* write-protected by sdata_lock and local->mtx so holding either is fine +* for read access. +* @cca_color: the color that we will have after the change. */ struct ieee80211_vif {enum nl80211_iftype type;
@@ -1669,6 +1673,9 @@ struct ieee80211_vif {bool txqs_stopped[IEEE80211_NUM_ACS ]; +bool cca_active; +u8 cca_color; +/* must be last */ u8 drv_priv[]__aligned(sizeof(void *)) ; };
@@ -4737,6 +4744,11 @@ void ieee80211_report_low_ack(struct ieee80211_sta *sta, u32 num_packets);#define IEEE80211_MAX_CSA_COUNTERS_NUM 2 +enum mac80211_counter { +MAC80211_COUNTER_CSA =0 , +MAC80211_COUNTER_CCA , +}; +/** * struct ieee80211_mutable_offsets - mutable beacon offsets * @tim_offset: position of TIM element
@@ -4744,12 +4756,15 @@ void ieee80211_report_low_ack(struct ieee80211_sta *sta, u32 num_packets);* @csa_counter_offs: array of IEEE80211_MAX_CSA_COUNTERS_NUM offsets * to CSA counters. This array can contain zero values which * should be ignored. +* @cca_counter_off: offset to the cca counter. zero values should be +* ignored. */ struct ieee80211_mutable_offsets {u16 tim_offset;u16 tim_length;u16 csa_counter_offs[IEEE80211_MAX_CSA_COUNTERS_NUM ]; +u16 cca_counter_off; };/**
@@ -4862,6 +4877,38 @@ void ieee80211_csa_finish(struct ieee80211_vif *vif);*/ bool ieee80211_csa_is_complete (struct ieee80211_vif *vif); +/** +* ieee80211_cca_update_counter - request mac80211 to decrement the cca counter +* @vif: &struct ieee80211_vif pointer from the add_interface callback. +* +* The cca counter should be updated after each beacon transmission. +* This function is called implicitly when +* ieee80211_beacon_get/ieee80211_beacon_get_tim are called, however if the +* beacon frames are generated by the device, the driver should call this +* function after each beacon transmission to sync mac80211's cca counters. +* +* Return: new csa counter value +*/ + +u8 ieee80211_cca_update_counter (struct ieee80211_vif *vif); + +/** +* ieee80211_cca_finish - notify mac80211 about color change +* @vif: &struct ieee80211_vif pointer from the add_interface callback. +* +* After a color change announcement was scheduled and the counter in this +* announcement hits 1, this function must be called by the driver to +* notify mac80211 that the color can be changed +*/ +void ieee80211_cca_finish (struct ieee80211_vif *vif); + +/** +* ieee80211_cca_is_complete - find out if counters reached 1 +* @vif: &struct ieee80211_vif pointer from the add_interface callback. +* +* This function returns whether the color change counters reached zero. +*/ +bool ieee80211_cca_is_complete (struct ieee80211_vif *vif);/** * ieee80211_proberesp_get - retrieve a Probe Response template
@@ -6558,4 +6605,15 @@ u32 ieee80211_calc_tx_airtime(struct ieee80211_hw *hw,*/ bool ieee80211_set_hw_80211_encap (struct ieee80211_vif *vif,bool enable); +/** +* ieeee80211_obss_color_collision_notify notify userland about a BSS color +* collision. +* +* @vif: &struct ieee80211_vif pointer from the add_interface callback. +* @color_bitmap: a 64 bit bitmap representing the colors that the local BSS is +* aware of. +*/ +void +ieeee80211_obss_color_collision_notify (struct ieee80211_vif *vif, +u64 color_bitmap);#endif /* MAC80211_H */
net/mac80211/cfg.c +217 -8
307 lines not on this page · raw message
net/mac80211/ieee80211_i.h +15 -0
@@ -256,12 +256,21 @@ struct ieee80211_csa_settings {u8 count; }; +struct ieee80211_cca_settings { +u16 counter_offset_beacon; +u16 counter_offset_presp; + +u8 count; +}; +struct beacon_data {u8 *head, *tail;int head_len, tail_len;struct ieee80211_meshconf_ie *meshconf;u16 csa_counter_offsets[IEEE80211_MAX_CSA_COUNTERS_NUM ];u8 csa_current_counter; +u16 cca_counter_offset; +u8 cca_current_counter;struct rcu_head rcu_head; };
@@ -269,6 +278,7 @@ struct probe_resp {struct rcu_head rcu_head;int len;u16 csa_counter_offsets[IEEE80211_MAX_CSA_COUNTERS_NUM ]; +u16 cca_counter_offset;u8 data[]; };
@@ -924,6 +934,8 @@ struct ieee80211_sub_if_data {bool csa_block_tx;/* write-protected by sdata_lock and local->mtx */ struct cfg80211_chan_def csa_chandef; +struct work_struct cca_finalize_work; +struct list_head assigned_chanctx_list;/* protected by chanctx_mtx */ struct list_head reserved_chanctx_list;/* protected by chanctx_mtx */
@@ -1738,6 +1750,9 @@ void ieee80211_csa_finalize_work(struct work_struct *work);int ieee80211_channel_switch (struct wiphy *wiphy,struct net_device *dev,struct cfg80211_csa_settings *params); +/* color change handling */ +void ieee80211_cca_finalize_work (struct work_struct *work); +/* interface handling */ #define MAC80211_SUPPORTED_FEATURES_TX (NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM | \ NETIF_F_HW_CSUM | NETIF_F_SG | \
net/mac80211/iface.c +3 -0
@@ -912,6 +912,8 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, GFP_KERNEL); } +cancel_work_sync (&sdata->cca_finalize_work); +/* APs need special treatment */ if (sdata->vif.type ==NL80211_IFTYPE_AP ) {struct ieee80211_sub_if_data *vlan, *tmpsdata;
@@ -1489,6 +1491,7 @@ static void ieee80211_setup_sdata(struct ieee80211_sub_if_data *sdata,INIT_WORK (&sdata->work, ieee80211_iface_work);INIT_WORK (&sdata->recalc_smps, ieee80211_recalc_smps_work);INIT_WORK (&sdata->csa_finalize_work, ieee80211_csa_finalize_work); +INIT_WORK (&sdata->cca_finalize_work, ieee80211_cca_finalize_work);INIT_LIST_HEAD (&sdata->assigned_chanctx_list);INIT_LIST_HEAD (&sdata->reserved_chanctx_list);
net/mac80211/tx.c +109 -19
209 lines not on this page · raw message
Signature · 1 line
2.25.1
Johannes Berg
maintainerRe: [PATCH V2 2/3] mac80211: add support for BSS coloring
Quoted 7 lines · John Crispin
The CCA (color change announcement) is very similar to how CSA works where we have an IE that includes a counter. When the counter hits 0, the new color is applied via an updated beacon.
This patch makes the CSA counter functionality reusable, rather than implementing it again. This also allows for future reuse incase support for other counter IEs gets added.
Makes sense. But
include/net/mac80211.h void ieee80211_report_low_ack(struct ieee80211_sta *sta, u32 num_packets); · line 4767
Quoted 13 lines
include/net/mac80211.h +3
-0@@ -4744,12 +4756,15 @@ void ieee80211_report_low_ack(struct ieee80211_sta *sta, u32 num_packets);* @csa_counter_offs: array of IEEE80211_MAX_CSA_COUNTERS_NUM offsets * to CSA counters. This array can contain zero values which * should be ignored. +* @cca_counter_off: offset to the cca counter. zero values should be +* ignored. */ struct ieee80211_mutable_offsets {u16 tim_offset;u16 tim_length;u16 csa_counter_offs[IEEE80211_MAX_CSA_COUNTERS_NUM ]; +u16 cca_counter_off;
why then do you need a new field here?
include/net/mac80211.h void ieee80211_csa_finish(struct ieee80211_vif *vif); · line 4890
Quoted 11 lines
include/net/mac80211.h +11
-0+/** +* ieee80211_cca_update_counter - request mac80211 to decrement the cca counter +* @vif: &struct ieee80211_vif pointer from the add_interface callback. +* +* The cca counter should be updated after each beacon transmission. +* This function is called implicitly when +* ieee80211_beacon_get/ieee80211_beacon_get_tim are called, however if the +* beacon frames are generated by the device, the driver should call this +* function after each beacon transmission to sync mac80211's cca counters. +* +* Return: new csa counter value
that's a bit ... mixed up with cca vs. csa? Please capitalize these too.
Quoted 1 line
+u8
ieee80211_cca_update_counter(struct ieee80211_vif *vif);
(except in the function name of course :) )
Quoted 7 lines
include/net/mac80211.h +7
-0+/** +* ieee80211_cca_finish - notify mac80211 about color change +* @vif: &struct ieee80211_vif pointer from the add_interface callback. +* +* After a color change announcement was scheduled and the counter in this +* announcement hits 1, this function must be called by the driver to +* notify mac80211 that the color can be changed
include/net/mac80211.h void ieee80211_csa_finish(struct ieee80211_vif *vif); · line 4911
Quoted 10 lines
include/net/mac80211.h +10
-0+*/ +void ieee80211_cca_finish (struct ieee80211_vif *vif); + +/** +* ieee80211_cca_is_complete - find out if counters reached 1 +* @vif: &struct ieee80211_vif pointer from the add_interface callback. +* +* This function returns whether the color change counters reached zero. +*/ +bool ieee80211_cca_is_complete (struct ieee80211_vif *vif);
If you're reusing, why do you even need the new functions? Wouldn't it make more sense to rename the CSA functions to something like
ieee80211_beacon_countdown_...()?
or something like that?
include/net/mac80211.h u32 ieee80211_calc_tx_airtime(struct ieee80211_hw *hw, · line 6618
Quoted 11 lines
include/net/mac80211.h +11
-0+/** +* ieeee80211_obss_color_collision_notify notify userland about a BSS color +* collision. +* +* @vif: &struct ieee80211_vif pointer from the add_interface callback. +* @color_bitmap: a 64 bit bitmap representing the colors that the local BSS is +* aware of. +*/ +void +ieeee80211_obss_color_collision_notify (struct ieee80211_vif *vif, +u64 color_bitmap);
Come to think of it, it might be good to break this whole collision stuff out into two separate patches. Obviously one is only useful with the other, but easier to look at.
net/mac80211/cfg.c static int ieee80211_set_monitor_channel(struct wiphy *wiphy, · line 813
Quoted 5 lines
static int ieee80211_set_probe_resp(struct
ieee80211_sub_if_data*sdata,net/mac80211/cfg.c +2
-1const u8 *resp, size_t resp_len, - const struct ieee80211_csa_settings *csa) + const struct ieee80211_csa_settings *csa, + const struct ieee80211_cca_settings *cca)
How do these differ? Why need both instead of renaming one?
net/mac80211/cfg.c static int ieee80211_set_probe_resp(struct ieee80211_sub_if_data *sdata, · line 834
Quoted 2 lines
net/mac80211/cfg.c +2
-0+if (cca) + new->cca_counter_offset = cca->counter_offset_presp;
What if we were to need two counters for this in the future? I think the nl80211 API even allowed for that?
Hmm. This doesn't seem like that much "reuse" if all the APIs are duplicated?
johannes
PATCH v2 3/3 ath11k: add support for BSS coloring
In reply to John CrispinWhenever the MAC detects a color collision or any of its associated station detects one the FW will send out an event. Add the code to parse and handle this event. and pass the data up to mac80211.
The FW does not provide an offload feature such as the one used for CSA. The CCA process is hence triggered via the beacon offload tx completion events sent out by the FW.
---
Changes in V2
* properly set the BSS color to avoid duplicate events
* turn the collision warning into a dbg message
drivers/net/wireless/ath/ath11k/mac.c | 36 +++++++++++++++++ drivers/net/wireless/ath/ath11k/mac.h | 1 + drivers/net/wireless/ath/ath11k/wmi.c | 57 +++++++++++++++++++++++++++ drivers/net/wireless/ath/ath11k/wmi.h | 14 +++++++ 4 files changed, 108 insertions(+)
drivers/net/wireless/ath/ath11k/mac.c +36 -0
@@ -720,6 +720,22 @@ static int ath11k_mac_setup_bcn_tmpl(struct ath11k_vif *arvif)return ret; } +void ath11k_mac_bcn_tx_event (struct ath11k_vif *arvif) +{ +struct ieee80211_vif *vif = arvif->vif; + +if (!vif->cca_active) +return ; + +if (ieee80211_cca_is_complete (vif)) { +ieee80211_cca_finish (vif); +return ; + } + +ieee80211_cca_update_counter (vif); +ath11k_mac_setup_bcn_tmpl (arvif); +} +static void ath11k_control_beaconing (struct ath11k_vif *arvif,struct ieee80211_bss_conf *info) {
@@ -1974,6 +1990,24 @@ static void ath11k_mac_op_bss_info_changed(struct ieee80211_hw *hw,if (ret)ath11k_warn (ar->ab,"failed to set bss color collision on vdev %i: %d\n" , arvif->vdev_id, ret); + + param_id =WMI_VDEV_PARAM_BSS_COLOR ; +if (info->he_bss_color.disabled) + param_value =IEEE80211_HE_OPERATION_BSS_COLOR_DISABLED ; +else + param_value = info->he_bss_color.color << +IEEE80211_HE_OPERATION_BSS_COLOR_OFFSET ; + + ret =ath11k_wmi_vdev_set_param_cmd (ar, arvif->vdev_id, + param_id, + param_value); +if (ret) +ath11k_warn (ar->ab, +"failed to set bss color param on vdev %i: %d\n" , + arvif->vdev_id, ret); + +ath11k_info (ar->ab,"bss color param 0x%x set on vdev %i\n" , + param_value, arvif->vdev_id); }else if (vif->type ==NL80211_IFTYPE_STATION ) { ret = ath11k_wmi_send_bss_color_change_enable_cmd(ar, arvif->vdev_id,
@@ -5883,6 +5917,8 @@ static int __ath11k_mac_register(struct ath11k *ar) ar->hw->wiphy->features |=NL80211_FEATURE_AP_MODE_CHAN_WIDTH_CHANGE |NL80211_FEATURE_AP_SCAN ; + ar->hw->wiphy->flags |=WIPHY_FLAG_SUPPORTS_BSS_COLOR ; + ar->max_num_stations =TARGET_NUM_STATIONS ; ar->max_num_peers =TARGET_NUM_PEERS_PDEV ;
drivers/net/wireless/ath/ath11k/mac.h +1 -0
@@ -146,4 +146,5 @@ int ath11k_mac_tx_mgmt_pending_free(int buf_id, void *skb, void *ctx);u8 ath11k_mac_bw_to_mac80211_bw (u8 bw);enum ath11k_supported_bw ath11k_mac_mac80211_bw_to_ath11k_bw (enum rate_info_bw bw);enum hal_encrypt_type ath11k_dp_tx_get_encrypt_type (u32 cipher); +void ath11k_mac_bcn_tx_event (struct ath11k_vif *arvif);#endif
drivers/net/wireless/ath/ath11k/wmi.c +57 -0
87 lines not on this page · raw message
drivers/net/wireless/ath/ath11k/wmi.h +14 -0
@@ -723,6 +723,7 @@ enum wmi_tlv_event_id {WMI_MDNS_STATS_EVENTID =WMI_TLV_CMD (WMI_GRP_MDNS_OFL ),WMI_SAP_OFL_ADD_STA_EVENTID =WMI_TLV_CMD (WMI_GRP_SAP_OFL ),WMI_SAP_OFL_DEL_STA_EVENTID , +WMI_OBSS_COLOR_COLLISION_DETECTION_EVENTID =WMI_EVT_GRP_START_ID (WMI_GRP_OBSS_OFL ),WMI_OCB_SET_CONFIG_RESP_EVENTID =WMI_TLV_CMD (WMI_GRP_OCB ),WMI_OCB_GET_TSF_TIMER_RESP_EVENTID , WMI_DCC_GET_STATS_RESP_EVENTID,
@@ -4705,6 +4706,13 @@ struct wmi_obss_spatial_reuse_params_cmd {#define ATH11K_BSS_COLOR_COLLISION_DETECTION_STA_PERIOD_MS 10000#define ATH11K_BSS_COLOR_COLLISION_DETECTION_AP_PERIOD_MS 5000 +enum wmi_bss_color_collision { +WMI_BSS_COLOR_COLLISION_DISABLE =0 , +WMI_BSS_COLOR_COLLISION_DETECTION , +WMI_BSS_COLOR_FREE_SLOT_TIMER_EXPIRY , +WMI_BSS_COLOR_FREE_SLOT_AVAILABLE , +}; +struct wmi_obss_color_collision_cfg_params_cmd {u32 tlv_header;u32 vdev_id;
@@ -4722,6 +4730,12 @@ struct wmi_bss_color_change_enable_params_cmd {u32 enable; } __packed; +struct wmi_obss_color_collision_event { +u32 vdev_id; +u32 evt_type; +u64 obss_color_bitmap; +} __packed; +#define ATH11K_IPV4_TH_SEED_SIZE 5#define ATH11K_IPV6_TH_SEED_SIZE 11
Signature · 7 lines
2.25.1 -- ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
Johannes Berg
maintainerQuoted 12 lines · John Crispin
+/**
+ * structcfg80211_cca_settings- color change settings
+ *
+ * Used for color change
+ *
+ * @beacon_cca: beacon data while performing the change
+ * @counter_offsets_beacon: offsets of the counters within the beacon (tail)
+ * @counter_offsets_presp: offsets of the counters within the probe response
+ * @beacon_after: beacon data to be used after the change
+ * @count: number of beacons until the change
+ * @color: the color that we will have after th change
typo: the change
include/net/cfg80211.h enum wiphy_flags { · line 4227
Quoted 10 lines
* @WIPHY_FLAG_SUPPORTS_EXT_KEK_KCK: The device supports bigger kek and kck keys
+ * @WIPHY_FLAG_SUPPORTS_BSS_COLOR: Device supports BSS coloring
*/
enumwiphy_flags{include/net/cfg80211.h +1
-0WIPHY_FLAG_SUPPORTS_EXT_KEK_KCK = BIT(0),@@ -4198,6 +4224,7 @@ enum wiphy_flags {WIPHY_FLAG_SUPPORTS_5_10_MHZ =BIT (22 ),WIPHY_FLAG_HAS_CHANNEL_SWITCH =BIT (23 ),WIPHY_FLAG_HAS_STATIC_WEP =BIT (24 ), + WIPHY_FLAG_SUPPORTS_BSS_COLOR = BIT(25),
That seems to belong into an entirely different patchset?
And probably should be an extended nl80211 feature?
include/uapi/linux/nl80211.h line 1185
Quoted 7 lines
include/uapi/linux/nl80211.h +7
-0+* @NL80211_CMD_CCA_STARTED_NOTIFY: Notify userland, that we color change has +* started +* +* @NL80211_CMD_CCA_ABORTED_NOTIFY: Notify userland, that we color change has +* been aborted +* +* @NL80211_CMD_CCA_NOTIFY: Notify userland, that we color change has completed
s/userland,/userland/
s/we/the/
Btw, whoever came up with "CCA" as the acronym for this? if it's not in the spec, can you change it? I can't not think "channel clear assessment" ...
Quoted 2 lines
+ * @NL80211_ATTR_OBSS_COLOR_BITMAP: bitmap of the 64 BSS colors for the
+ * %NL80211_CMD_OBSS_COLOR_COLLISION command.
u64 attribute then, presumably?
s/command/event/?
Quoted 4 lines
+ * @NL80211_ATTR_CCA_C_OFF_BEACON: An array of offsets (u16) to the color
+ * switch counters in the beacons tail (%NL80211_ATTR_BEACON_TAIL).
+ * @NL80211_ATTR_CCA_C_OFF_PRESP: An array of offsets (u16) to the color
+ * switch counters in the probe response (%NL80211_ATTR_PROBE_RESP).
I think we discussed this, and we're not going to support both CSA and CCA at the same time, right?
So perhaps we can repurpose the CSA attributes, and even rename them by leaving a "#define oldname newname" in nl80211.h. We've done that before.
E.g. just NL80211_ATTR_CNTDWN_OFFS_PRESP or something like that?
net/wireless/nl80211.c static int nl80211_set_tid_config(struct sk_buff *skb, · line 14315
Quoted 3 lines
net/wireless/nl80211.c +3
-0+ err =nla_parse_nested_deprecated (cca_attrs,NL80211_ATTR_MAX , + info->attrs[NL80211_ATTR_CCA_IES ], + nl80211_policy, info->extack);
You shouldn't use the _deprecated function for new attributes.
And if this is nested, you should use NLA_POLICY_NESTED() in the policy. You're now allowed to nest recursively (i.e. nest nl80211_policy into its own nested attributes), but I'm a bit confused as to why you need that and didn't move to use a new sub-enum? That'd save a ton of stack space - in fact the "cca_attrs" array is probably big enough now to cause stack size warnings immediately?
johannes