mac80211: add a struct for holding BSS color settings
Subsystems (4)
PATCH v2 1/7 mac80211: add a struct for holding BSS color settings
Right now we only track the actual color but not the other bits contained within the he_oper field. Fix this by creating a new struct to hold all of the info.
--- include/net/cfg80211.h | 15 +++++++++++++++ include/net/mac80211.h | 2 ++ 2 files changed, 17 insertions(+)
include/net/cfg80211.h +15 -0
@@ -259,6 +259,19 @@ struct ieee80211_he_obss_pd {u8 max_offset; }; +/** +* struct ieee80211_he_bss_color - AP settings for BSS coloring +* +* @color: the current color. +* @disabled: is the feature disabled. +* @partial: define the AID equation. +*/ +struct ieee80211_he_bss_color { +u8 color; +bool disabled; +bool partial; +}; +/** * struct ieee80211_sta_ht_cap - STA's HT capabilities *
@@ -910,6 +923,7 @@ enum cfg80211_ap_settings_flags {* @twt_responder: Enable Target Wait Time * @flags: flags, as defined in enum cfg80211_ap_settings_flags * @he_obss_pd: OBSS Packet Detection settings +* @he_bss_color: BSS Color settings */ struct cfg80211_ap_settings {struct cfg80211_chan_def chandef;
@@ -938,6 +952,7 @@ struct cfg80211_ap_settings {bool twt_responder;u32 flags;struct ieee80211_he_obss_pd he_obss_pd; +struct ieee80211_he_bss_color he_bss_color; };/**
include/net/mac80211.h +2 -0
@@ -604,6 +604,7 @@ struct ieee80211_ftm_responder_params {* in order to discover all the nontransmitted BSSIDs in the set. * @he_operation: HE operation information of the AP we are connected to * @he_obss_pd: OBSS Packet Detection parameters. +* @he_bss_color: BSS coloring settings, if BSS supports HE */ struct ieee80211_bss_conf {const u8 *bssid;
@@ -667,6 +668,7 @@ struct ieee80211_bss_conf {u8 profile_periodicity;struct ieee80211_he_operation he_operation;struct ieee80211_he_obss_pd he_obss_pd; +struct ieee80211_he_bss_color he_bss_color; };/**
Signature · 7 lines
2.20.1 _______________________________________________ ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
PATCH v2 3/7 mac80211: add handling for BSS color
It is now possible to propagate BSS color settings into the subsystem. Lets make mac80211 also handle them so that we can send them further down the stack into the drivers. We continue to populate the old bss_color field until all users have been updated to use the new he_bss_color struct.
--- include/net/mac80211.h | 2 ++ net/mac80211/cfg.c | 5 ++++- net/mac80211/mlme.c | 8 ++++++++ 3 files changed, 14 insertions(+), 1 deletion(-)
include/net/mac80211.h +2 -0
@@ -316,6 +316,7 @@ struct ieee80211_vif_chanctx_switch {* functionality changed for this BSS (AP mode). * @BSS_CHANGED_TWT: TWT status changed * @BSS_CHANGED_HE_OBSS_PD: OBSS Packet Detection status changed. +* @BSS_CHANGED_HE_BSS_COLOR: BSS Color has changed * */ enum ieee80211_bss_change {
@@ -348,6 +349,7 @@ enum ieee80211_bss_change {BSS_CHANGED_FTM_RESPONDER =1 <<26 ,BSS_CHANGED_TWT =1 <<27 ,BSS_CHANGED_HE_OBSS_PD =1 <<28 , + BSS_CHANGED_HE_BSS_COLOR = 1<<29, /* when adding here, make sure to change ieee80211_reconfig */ };
net/mac80211/cfg.c +4 -1
@@ -981,7 +981,8 @@ static int ieee80211_start_ap(struct wiphy *wiphy, struct net_device *dev,BSS_CHANGED_P2P_PS |BSS_CHANGED_TXPOWER |BSS_CHANGED_TWT | -BSS_CHANGED_HE_OBSS_PD ; +BSS_CHANGED_HE_OBSS_PD | +BSS_CHANGED_HE_BSS_COLOR ;int err;int prev_beacon_int;
@@ -1054,6 +1055,8 @@ static int ieee80211_start_ap(struct wiphy *wiphy, struct net_device *dev, sdata->vif.bss_conf.twt_responder = params->twt_responder;memcpy (&sdata->vif.bss_conf.he_obss_pd, ¶ms->he_obss_pd,sizeof (struct ieee80211_he_obss_pd )); +memcpy (&sdata->vif.bss_conf.he_bss_color, ¶ms->he_bss_color, +sizeof (struct ieee80211_he_bss_color )); sdata->vif.bss_conf.ssid_len = params->ssid_len;if (params->ssid_len)
net/mac80211/mlme.c +8 -0
@@ -3372,8 +3372,16 @@ static bool ieee80211_assoc_success(struct ieee80211_sub_if_data *sdata,if (bss_conf->he_support) { bss_conf->bss_color = + bss_conf->he_bss_color.color =le32_get_bits (elems.he_operation->he_oper_params,IEEE80211_HE_OPERATION_BSS_COLOR_MASK ); + bss_conf->he_bss_color.partial = +le32_get_bits (elems.he_operation->he_oper_params, +IEEE80211_HE_OPERATION_PARTIAL_BSS_COLOR ); + bss_conf->he_bss_color.disabled = +le32_get_bits (elems.he_operation->he_oper_params, +IEEE80211_HE_OPERATION_BSS_COLOR_DISABLED ); + changed |=BSS_CHANGED_HE_BSS_COLOR ; bss_conf->htc_trig_based_pkt_ext = le32_get_bits(elems.he_operation->he_oper_params,
Signature · 7 lines
2.20.1 _______________________________________________ ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
PATCH v2 2/7 nl80211: add handling for BSS color
In reply to John CrispinThis patch adds the attributes, policy and parsing code to allow userland to send the info about the BSS coloring settings to the kernel.
Changes in V2
* fix a copy paste error
--- include/uapi/linux/nl80211.h | 27 ++++++++++++++++++++++++ net/wireless/nl80211.c | 40 ++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+)
include/uapi/linux/nl80211.h +27 -0
@@ -2361,6 +2361,8 @@ enum nl80211_commands {* @NL80211_ATTR_HE_OBSS_PD: nested attribute for OBSS Packet Detection * functionality. * +* @NL80211_ATTR_HE_BSS_COLOR: nested attribute for BSS Color Settings. +* * @NUM_NL80211_ATTR: total number of nl80211_attrs available * @NL80211_ATTR_MAX: highest attribute number currently defined * @__NL80211_ATTR_AFTER_LAST: internal use
@@ -2820,6 +2822,8 @@ enum nl80211_attrs {NL80211_ATTR_HE_OBSS_PD , +NL80211_ATTR_HE_BSS_COLOR , +/* add attributes here, update the policy in nl80211.c */ __NL80211_ATTR_AFTER_LAST,
@@ -6516,5 +6520,28 @@ enum nl80211_obss_pd_attributes { NL80211_HE_OBSS_PD_ATTR_MAX = __NL80211_HE_OBSS_PD_ATTR_LAST - 1, }; +/** +* enum nl80211_bss_color_attributes - BSS Color attributes +* @__NL80211_HE_BSS_COLOR_ATTR_INVALID: Invalid +* +* @NL80211_HE_BSS_COLOR: the current BSS Color. +* @NL80211_HE_BSS_COLOR_DISABLED: is BSS coloring disabled. +* @NL80211_HE_BSS_COLOR_PARTIAL: the AID equation to be used.. +* +* @__NL80211_HE_BSS_COLOR_ATTR_LAST: Internal +* @NL80211_HE_BSS_COLOR_ATTR_MAX: highest BSS Color attribute. +*/ +enum nl80211_bss_color_attributes { + __NL80211_HE_BSS_COLOR_ATTR_INVALID, + +NL80211_HE_BSS_COLOR , +NL80211_HE_BSS_COLOR_DISABLED , +NL80211_HE_BSS_COLOR_PARTIAL , + +/* keep last */ + __NL80211_HE_BSS_COLOR_ATTR_LAST, +NL80211_HE_BSS_COLOR_ATTR_MAX = __NL80211_HE_BSS_COLOR_ATTR_LAST -1 , +}; +#endif /* __LINUX_NL80211_H */
net/wireless/nl80211.c +40 -0
@@ -289,6 +289,13 @@ he_obss_pd_policy[NL80211_HE_OBSS_PD_ATTR_MAX + 1] = { NLA_POLICY_RANGE(NLA_U8, 1, 20), }; +static const struct nla_policy +he_bss_color_policy[NL80211_HE_BSS_COLOR_ATTR_MAX +1 ] = { + [NL80211_HE_BSS_COLOR ] =NLA_POLICY_RANGE (NLA_U8 ,1 ,63 ), + [NL80211_HE_BSS_COLOR_DISABLED ] = { .type =NLA_FLAG }, + [NL80211_HE_BSS_COLOR_PARTIAL ] = { .type =NLA_FLAG }, +}; +const struct nla_policy nl80211_policy[NUM_NL80211_ATTR ] = { [0 ] = { .strict_start_type =NL80211_ATTR_HE_OBSS_PD }, [NL80211_ATTR_WIPHY ] = { .type =NLA_U32 },
@@ -584,6 +591,7 @@ const struct nla_policy nl80211_policy[NUM_NL80211_ATTR] = { .len = SAE_PASSWORD_MAX_LEN }, [NL80211_ATTR_TWT_RESPONDER] = { .type = NLA_FLAG }, [NL80211_ATTR_HE_OBSS_PD] = NLA_POLICY_NESTED(he_obss_pd_policy), + [NL80211_ATTR_HE_BSS_COLOR] = NLA_POLICY_NESTED(he_bss_color_policy), };/* policy for the key attributes */
@@ -4441,6 +4449,30 @@ static int nl80211_parse_he_obss_pd(struct nlattr *attrs,return 0 ; } +static int nl80211_parse_he_bss_color (struct nlattr *attrs, +struct ieee80211_he_bss_color *he_bss_color) +{ +struct nlattr *tb[NL80211_HE_BSS_COLOR_ATTR_MAX +1 ]; +int err; + + err =nla_parse_nested (tb,NL80211_HE_BSS_COLOR_ATTR_MAX , attrs, + he_bss_color_policy,NULL ); +if (err) +return err; + +if (!tb[NL80211_HE_BSS_COLOR ]) +return -EINVAL ; + + he_bss_color->color = +nla_get_u8 (tb[NL80211_HE_BSS_COLOR ]); + he_bss_color->disabled = +nla_get_flag (tb[NL80211_HE_BSS_COLOR_DISABLED ]); + he_bss_color->partial = +nla_get_flag (tb[NL80211_HE_BSS_COLOR_PARTIAL ]); + +return 0 ; +} +static void nl80211_check_ap_rate_selectors (struct cfg80211_ap_settings *params,const u8 *rates) {
@@ -4733,6 +4765,14 @@ static int nl80211_start_ap(struct sk_buff *skb, struct genl_info *info)return err; } +if (info->attrs[NL80211_ATTR_HE_BSS_COLOR ]) { + err =nl80211_parse_he_bss_color ( + info->attrs[NL80211_ATTR_HE_BSS_COLOR ], + ¶ms.he_bss_color); +if (err) +return err; + } +nl80211_calculate_ap_params (¶ms);if (info->attrs[NL80211_ATTR_EXTERNAL_AUTH_SUPPORT ])
Signature · 7 lines
2.20.1 _______________________________________________ ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
PATCH v2 4/7 iwlwifi: use new bss_color struct
In reply to John CrispinWe will be removing the bss_color element. Lets use the new he_bss_color struct instead.
--- drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +1 -1
@@ -2225,7 +2225,7 @@ static void iwl_mvm_cfg_he_sta(struct iwl_mvm *mvm,struct iwl_he_sta_context_cmd sta_ctxt_cmd = { .sta_id = sta_id, .tid_limit =IWL_MAX_TID_COUNT , - .bss_color = vif->bss_conf.bss_color, + .bss_color = vif->bss_conf.he_bss_color.color, .htc_trig_based_pkt_ext = vif->bss_conf.htc_trig_based_pkt_ext, .frame_time_rts_th =cpu_to_le16 (vif->bss_conf.frame_time_rts_th),
Signature · 7 lines
2.20.1 _______________________________________________ ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
PATCH v2 5/7 mac80211: drop now unused bss_color element
In reply to John CrispinWith all users of bss_color converted we can drop the old element. Driver code should now use the new he_bss_color struct.
--- include/net/mac80211.h | 2 -- net/mac80211/mlme.c | 1 - 2 files changed, 3 deletions(-)
include/net/mac80211.h +0 -2
@@ -496,7 +496,6 @@ struct ieee80211_ftm_responder_params {* This structure keeps information about a BSS (and an association * to that BSS) that can change during the lifetime of the BSS. * -* @bss_color: 6-bit value to mark inter-BSS frame, if BSS supports HE * @htc_trig_based_pkt_ext: default PE in 4us units, if BSS supports HE * @multi_sta_back_32bit: supports BA bitmap of 32-bits in Multi-STA BACK * @uora_exists: is the UORA element advertised by AP
@@ -610,7 +609,6 @@ struct ieee80211_ftm_responder_params {*/ struct ieee80211_bss_conf {const u8 *bssid; -u8 bss_color;u8 htc_trig_based_pkt_ext;bool multi_sta_back_32bit;bool uora_exists;
net/mac80211/mlme.c +0 -1
@@ -3371,7 +3371,6 @@ static bool ieee80211_assoc_success(struct ieee80211_sub_if_data *sdata, }if (bss_conf->he_support) { - bss_conf->bss_color = bss_conf->he_bss_color.color =le32_get_bits (elems.he_operation->he_oper_params,IEEE80211_HE_OPERATION_BSS_COLOR_MASK );
Signature · 7 lines
2.20.1 _______________________________________________ ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
PATCH v2 6/7 ath11k: add WMI calls required for handling BSS color
In reply to John CrispinIf the he_operation field of the beacon sets a BSS color, we need to inform the FW of the settings. This patch adds the WMI command handlers required to do so.
Changes in V2
* add WMI debug log
--- drivers/net/wireless/ath/ath11k/wmi.c | 77 +++++++++++++++++++++++++++ drivers/net/wireless/ath/ath11k/wmi.h | 31 +++++++++++ 2 files changed, 108 insertions(+)
drivers/net/wireless/ath/ath11k/wmi.c +77 -0
@@ -2790,6 +2790,83 @@ ath11k_wmi_send_obss_spr_cmd(struct ath11k *ar, u32 vdev_id,return ret; } +int +ath11k_wmi_send_obss_color_collision_cfg_cmd (struct ath11k *ar,u32 vdev_id, +u8 bss_color,u32 period, +bool enable) +{ +struct ath11k_pdev_wmi *wmi = ar->wmi; +struct ath11k_base *ab = wmi->wmi_ab->ab; +struct wmi_obss_color_collision_cfg_params_cmd *cmd; +struct sk_buff *skb; +int ret, len; + + len =sizeof (*cmd); + + skb =ath11k_wmi_alloc_skb (wmi->wmi_ab, len); +if (!skb) +return -ENOMEM ; + + cmd = (struct wmi_obss_color_collision_cfg_params_cmd *)skb->data; + cmd->tlv_header =FIELD_PREP (WMI_TLV_TAG ,WMI_TAG_OBSS_COLOR_COLLISION_DET_CONFIG ) | +FIELD_PREP (WMI_TLV_LEN , len -TLV_HDR_SIZE ); + cmd->vdev_id = vdev_id; + cmd->evt_type = enable ?ATH11K_OBSS_COLOR_COLLISION_DETECTION : +ATH11K_OBSS_COLOR_COLLISION_DETECTION_DISABLE ; + cmd->current_bss_color = bss_color; + cmd->detection_period_ms = period; + cmd->scan_period_ms =ATH11K_BSS_COLOR_COLLISION_SCAN_PERIOD_MS ; + cmd->free_slot_expiry_time_ms =0 ; + cmd->flags =0 ; + +ath11k_dbg (ar->ab,ATH11K_DBG_WMI , +"wmi_send_obss_color_collision_cfg id %d type %d " +"bss_color %d detect_period %d scan_period %d\n" , + cmd->vdev_id, cmd->evt_type, cmd->current_bss_color, + cmd->detection_period_ms, cmd->scan_period_ms); + + ret =ath11k_wmi_cmd_send (wmi, skb, +WMI_OBSS_COLOR_COLLISION_DET_CONFIG_CMDID ); +if (ret) { +ath11k_warn (ab,"Failed to send WMI_OBSS_COLOR_COLLISION_DET_CONFIG_CMDID" ); +dev_kfree_skb (skb); + } +return ret; +} + +int ath11k_wmi_send_bss_color_change_enable_cmd (struct ath11k *ar,u32 vdev_id,bool enable) +{ +struct ath11k_pdev_wmi *wmi = ar->wmi; +struct ath11k_base *ab = wmi->wmi_ab->ab; +struct wmi_bss_color_change_enable_params_cmd *cmd; +struct sk_buff *skb; +int ret, len; + + len =sizeof (*cmd); + + skb =ath11k_wmi_alloc_skb (wmi->wmi_ab, len); +if (!skb) +return -ENOMEM ; + + cmd = (struct wmi_bss_color_change_enable_params_cmd *)skb->data; + cmd->tlv_header =FIELD_PREP (WMI_TLV_TAG ,WMI_TAG_BSS_COLOR_CHANGE_ENABLE ) | +FIELD_PREP (WMI_TLV_LEN , len -TLV_HDR_SIZE ); + cmd->vdev_id = vdev_id; + cmd->enable = enable ?1 :0 ; + +ath11k_dbg (ar->ab,ATH11K_DBG_WMI , +"wmi_send_bss_color_change_enable id %d enable %d\n" , + cmd->vdev_id, cmd->enable); + + ret =ath11k_wmi_cmd_send (wmi, skb, +WMI_BSS_COLOR_CHANGE_ENABLE_CMDID ); +if (ret) { +ath11k_warn (ab,"Failed to send WMI_TWT_DIeABLE_CMDID" ); +dev_kfree_skb (skb); + } +return ret; +} +static void ath11k_fill_band_to_mac_param (struct ath11k_base *soc,struct wmi_host_pdev_band_to_mac *band_to_mac)
drivers/net/wireless/ath/ath11k/wmi.h +31 -0
@@ -483,6 +483,7 @@ enum wmi_tlv_cmd_id {WMI_SAR_LIMITS_CMDID ,WMI_OBSS_SCAN_ENABLE_CMDID =WMI_TLV_CMD (WMI_GRP_OBSS_OFL ),WMI_OBSS_SCAN_DISABLE_CMDID , +WMI_OBSS_COLOR_COLLISION_DET_CONFIG_CMDID ,WMI_LPI_MGMT_SNOOPING_CONFIG_CMDID =WMI_TLV_CMD (WMI_GRP_LPI ),WMI_LPI_START_SCAN_CMDID , WMI_LPI_STOP_SCAN_CMDID,
@@ -4694,6 +4695,30 @@ struct wmi_peer_oper_mode_change_event {u32 new_disablemu; } __packed; +#define ATH11K_BSS_COLOR_COLLISION_SCAN_PERIOD_MS 200 +#define ATH11K_OBSS_COLOR_COLLISION_DETECTION_DISABLE 0 +#define ATH11K_OBSS_COLOR_COLLISION_DETECTION 1 + +#define ATH11K_BSS_COLOR_COLLISION_DETECTION_STA_PERIOD_MS 10000 +#define ATH11K_BSS_COLOR_COLLISION_DETECTION_AP_PERIOD_MS 5000 + +struct wmi_obss_color_collision_cfg_params_cmd { +u32 tlv_header; +u32 vdev_id; +u32 flags; +u32 evt_type; +u32 current_bss_color; +u32 detection_period_ms; +u32 scan_period_ms; +u32 free_slot_expiry_time_ms; +} __packed; + +struct wmi_bss_color_change_enable_params_cmd { +u32 tlv_header; +u32 vdev_id; +u32 enable; +} __packed; +struct target_resource_config {u32 num_vdevs;u32 num_peers;
@@ -4892,4 +4917,10 @@ int ath11k_wmi_send_twt_resume_dialog_cmd(struct ath11k *ar, struct wmi_twt_resume_dialog_params *params);int ath11k_wmi_send_obss_spr_cmd (struct ath11k *ar,u32 vdev_id,struct ieee80211_he_obss_pd *he_obss_pd); +int ath11k_wmi_send_obss_color_collision_cfg_cmd (struct ath11k *ar,u32 vdev_id, +u8 bss_color,u32 period, +bool enable); +int ath11k_wmi_send_bss_color_change_enable_cmd (struct ath11k *ar,u32 vdev_id, +bool enable); +#endif
Signature · 7 lines
2.20.1 _______________________________________________ ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
PATCH v2 7/7 ath11k: add handling for BSS color
In reply to John CrispinThis patch adds code to handle the BSS_CHANGED_BSS_COLOR flag. It will trigger the propagation of BSS color settings into the FW. Handling is slightly different between AP and STA interfaces.
Changes in V2
* handle return codes
--- drivers/net/wireless/ath/ath11k/mac.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+)
drivers/net/wireless/ath/ath11k/mac.c +27 -0
@@ -1928,6 +1928,33 @@ static void ath11k_mac_op_bss_info_changed(struct ieee80211_hw *hw,ath11k_wmi_send_obss_spr_cmd (ar, arvif->vdev_id, &info->he_obss_pd); +if (changed &BSS_CHANGED_HE_BSS_COLOR ) { +if (vif->type ==NL80211_IFTYPE_AP ) { + ret =ath11k_wmi_send_obss_color_collision_cfg_cmd ( + ar, arvif->vdev_id, info->he_bss_color.color, +ATH11K_BSS_COLOR_COLLISION_DETECTION_AP_PERIOD_MS , + !info->he_bss_color.disabled); +if (ret) +ath11k_warn (ar->ab, +"failed to set bss color collision on vdev %i: %d\n" , + arvif->vdev_id, ret); + }else if (vif->type ==NL80211_IFTYPE_STATION ) { + ret =ath11k_wmi_send_bss_color_change_enable_cmd (ar, + arvif->vdev_id,1 ); +if (ret) +ath11k_warn (ar->ab, +"failed to enable bss color change on vdev %i: %d\n" , + arvif->vdev_id, ret); + ret =ath11k_wmi_send_obss_color_collision_cfg_cmd ( + ar, arvif->vdev_id,0 , +ATH11K_BSS_COLOR_COLLISION_DETECTION_STA_PERIOD_MS ,1 ); +if (ret) +ath11k_warn (ar->ab, +"failed to set bss color collision on vdev %i: %d\n" , + arvif->vdev_id, ret); +} + } +mutex_unlock (&ar->conf_mutex); }
Signature · 7 lines
2.20.1 _______________________________________________ ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
Johannes Berg
maintainerQuoted 9 lines · John Crispin
Right now we only track the actual color but not the other bits contained within the
he_operfield. Fix this by creating a new struct to hold all of the info.Signed-off-by John Crispin <[email protected]>--- include/net/cfg80211.h | 15 +++++++++++++++ include/net/mac80211.h | 2 ++ 2 files changed, 17 insertions(+)
I think you should drop this patch and put the cfg80211 and mac80211 update into the second and third patch of this series, respectively. It doesn't make much sense to add some unused structs.
include/net/cfg80211.h struct ieee80211_he_obss_pd {
Quoted 5 lines
include/net/cfg80211.h +0
-0@@ -259,6 +259,19 @@ struct ieee80211_he_obss_pd {
It looks like I didn't see that previously for that one,
include/net/cfg80211.h struct ieee80211_he_obss_pd { · line 263
Quoted 1 line
include/net/cfg80211.h +1
-0+* struct ieee80211_he_bss_color - AP settings for BSS coloring
but I'd kinda prefer this be called cfg80211_... since it's not part of ieee80211.h with all the over-the-air struct definitions. I'm sure we have some non-over-the-air things that are called ieee80211_*, but ...
johannes
Johannes Berg
maintainerRe: [PATCH v2 2/7] nl80211: add handling for BSS color
In reply to John CrispinQuoted 8 lines
+/**
+ * enumnl80211_bss_color_attributes- BSS Color attributes
+ * @__NL80211_HE_BSS_COLOR_ATTR_INVALID: Invalid
+ *
+ * @NL80211_HE_BSS_COLOR: the current BSS Color.
+ * @NL80211_HE_BSS_COLOR_DISABLED: is BSS coloring disabled.
+ * @NL80211_HE_BSS_COLOR_PARTIAL: the AID equation to be used..
It makes the names somewhat awkwardly long, but I think _ATTR should be included here like the invalid/last/max, to make clear it's not the color itself or something like that?
net/wireless/nl80211.c he_obss_pd_policy[NL80211_HE_OBSS_PD_ATTR_MAX + 1] = { · line 293
Quoted 2 lines
net/wireless/nl80211.c +2
-0+static const struct nla_policy +he_bss_color_policy[NL80211_HE_BSS_COLOR_ATTR_MAX +1 ] = {
I didn't realize this before and really thought about it only because I saw the one for the nl80211_policy in the context now, but I guess this should have a strict start type like below:
Quoted 1 line
[0] = { .strict_start_type =
NL80211_ATTR_HE_OBSS_PD},
though in this case we can probably do
[0] = { .strict_start_type = 0 },to indicate that all these should be treated strictly.
Also, not directly related to any code, can't the BSS color change, and thus you need a method to update it?
johannes
Johannes Berg
maintainerRe: [PATCH v2 5/7] mac80211: drop now unused bss_color element
In reply to John CrispinQuoted 2 lines · John Crispin
With all users of
bss_colorconverted we can drop the old element. Driver code should now use the newhe_bss_colorstruct.
I think it'd be OK to squash patches 3-5 together, minimal driver updates for changing mac80211 API are totally fine and will need to go via my tree anyway.
johannes
Re: [PATCH v2 2/7] nl80211: add handling for BSS color
In reply to Johannes BergQuoted 3 lines · Johannes Berg
Also, not directly related to any code, can't the BSS color change, and thus you need a method to update it?
Coming shortly once I start working on the collission events and then the hostapd color change algorithm
John