cfg80211: use only HE capability to set prohibited flags in 6 GHz
PATCH v3 1/11 cfg80211: use only HE capability to set prohibited flags in 6 GHz
The prohibited flags to determine whether configured bandwidth is supported by driver are validated only against HT and VHT capability. In 6 GHz band, Only HE capability should be validated to find out given chandef is usable.
--- net/wireless/chan.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 50 insertions(+), 4 deletions(-)
net/wireless/chan.c +50 -4
@@ -19,6 +19,11 @@ static bool cfg80211_valid_60g_freq(u32 freq)return freq >=58320 && freq <=70200 ; } +static bool cfg80211_is_6ghz_freq (u32 freq) +{ +return (freq >5940 && freq <7105 ); +} +void cfg80211_chandef_create (struct cfg80211_chan_def *chandef,struct ieee80211_channel *chan,enum nl80211_channel_type chan_type)
@@ -882,6 +887,7 @@ bool cfg80211_chandef_usable(struct wiphy *wiphy,struct ieee80211_sta_ht_cap *ht_cap;struct ieee80211_sta_vht_cap *vht_cap;struct ieee80211_edmg *edmg_cap; +const struct ieee80211_sta_he_cap *he_cap;u32 width, control_freq, cap;if (WARN_ON (!cfg80211_chandef_valid (chandef)))
@@ -890,6 +896,7 @@ bool cfg80211_chandef_usable(struct wiphy *wiphy, ht_cap = &wiphy->bands[chandef->chan->band]->ht_cap; vht_cap = &wiphy->bands[chandef->chan->band]->vht_cap; edmg_cap = &wiphy->bands[chandef->chan->band]->edmg_cap; + he_cap =ieee80211_get_he_sta_cap (wiphy->bands[chandef->chan->band]);if (edmg_cap->channels && !cfg80211_edmg_usable(wiphy,
@@ -919,6 +926,16 @@ bool cfg80211_chandef_usable(struct wiphy *wiphy,break ;case NL80211_CHAN_WIDTH_40 : width =40 ; +if (cfg80211_is_6ghz_freq (chandef->center_freq1)) { +if (!he_cap) +return false; +if (!he_cap->has_he_6ghz) +return false; +if (!(he_cap->he_cap_elem.phy_cap_info[0 ] & +IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_80MHZ_IN_5G )) +return false; +break ; + }if (!ht_cap->ht_supported)return false; if (!(ht_cap->cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40) ||
@@ -933,24 +950,53 @@ bool cfg80211_chandef_usable(struct wiphy *wiphy,break ;case NL80211_CHAN_WIDTH_80P80 : cap = vht_cap->cap &IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_MASK ; -if (cap !=IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160_80PLUS80MHZ ) +if (!cfg80211_is_6ghz_freq (chandef->center_freq1) && + cap !=IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160_80PLUS80MHZ )return false; +if (cfg80211_is_6ghz_freq (chandef->center_freq1)) { +if (!he_cap) +return false; +if (!he_cap->has_he_6ghz) +return false; +if (!(he_cap->he_cap_elem.phy_cap_info[0 ] & +IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_80PLUS80_MHZ_IN_5G )) +return false; + }/* fall through */ case NL80211_CHAN_WIDTH_80 : -if (!vht_cap->vht_supported) +if (cfg80211_is_6ghz_freq (chandef->center_freq1)) { +if (!he_cap) +return false; +if (!he_cap->has_he_6ghz) +return false; +if (!(he_cap->he_cap_elem.phy_cap_info[0 ] & +IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_80MHZ_IN_5G )) +return false; + }else if (!vht_cap->vht_supported) {return false; + } prohibited_flags |=IEEE80211_CHAN_NO_80MHZ ; width =80 ;break ;case NL80211_CHAN_WIDTH_160 : + prohibited_flags |=IEEE80211_CHAN_NO_160MHZ ; + width =160 ; +if (cfg80211_is_6ghz_freq (chandef->center_freq1)) { +if (!he_cap) +return false; +if (!he_cap->has_he_6ghz) +return false; +if (!(he_cap->he_cap_elem.phy_cap_info[0 ] & +IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G )) +return false; +break ; + }if (!vht_cap->vht_supported)return false; cap = vht_cap->cap &IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_MASK ;if (cap !=IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160MHZ && cap !=IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160_80PLUS80MHZ )return false; - prohibited_flags |=IEEE80211_CHAN_NO_160MHZ ; - width =160 ;break ;default :WARN_ON_ONCE (1 );
Signature · 1 line
2.7.4
PATCH v3 2/11 cfg80211: handle 6 GHz capability of new station
Handle 6 GHz HE capability while adding new station. It will be used later in mac80211 station processing.
--- include/net/cfg80211.h | 2 ++ include/uapi/linux/nl80211.h | 6 ++++++ net/wireless/nl80211.c | 12 ++++++++++++ 3 files changed, 20 insertions(+)
include/net/cfg80211.h +2 -0
@@ -1225,6 +1225,7 @@ struct sta_txpwr {* @he_capa_len: the length of the HE capabilities * @airtime_weight: airtime scheduler weight for this station * @txpwr: transmit power for an associated station +* @he_6ghz_capa: HE 6 GHz Band capabilities of station */ struct station_parameters {const u8 *supported_rates;
@@ -1257,6 +1258,7 @@ struct station_parameters {u8 he_capa_len;u16 airtime_weight;struct sta_txpwr txpwr; +const struct ieee80211_he_6ghz_band_cap *he_6ghz_capa; };/**
include/uapi/linux/nl80211.h +6 -0
@@ -2470,6 +2470,9 @@ enum nl80211_commands {* no roaming occurs between the reauth threshold and PMK expiration, * disassociation is still forced. * +* @NL80211_ATTR_HE_6GHZ_CAPABILITY: HE 6 GHz Band Capability element (from +* association request when used with NL80211_CMD_NEW_STATION). +* * @NUM_NL80211_ATTR: total number of nl80211_attrs available * @NL80211_ATTR_MAX: highest attribute number currently defined * @__NL80211_ATTR_AFTER_LAST: internal use
@@ -2945,6 +2948,8 @@ enum nl80211_attrs {NL80211_ATTR_PMK_LIFETIME ,NL80211_ATTR_PMK_REAUTH_THRESHOLD , +NL80211_ATTR_HE_6GHZ_CAPABILITY , +/* add attributes here, update the policy in nl80211.c */ __NL80211_ATTR_AFTER_LAST,
@@ -2998,6 +3003,7 @@ enum nl80211_attrs {#define NL80211_HE_MAX_CAPABILITY_LEN 54#define NL80211_MAX_NR_CIPHER_SUITES 5#define NL80211_MAX_NR_AKM_SUITES 2 +#define NL80211_HE_6GHZ_CAPABILITY_LEN 2#define NL80211_MIN_REMAIN_ON_CHANNEL_TIME 10
net/wireless/nl80211.c +12 -0
@@ -661,6 +661,10 @@ const struct nla_policy nl80211_policy[NUM_NL80211_ATTR] = { [NL80211_ATTR_CONTROL_PORT_NO_PREAUTH] = { .type = NLA_FLAG }, [NL80211_ATTR_PMK_LIFETIME] = NLA_POLICY_MIN(NLA_U32, 1), [NL80211_ATTR_PMK_REAUTH_THRESHOLD] = NLA_POLICY_RANGE(NLA_U8, 1, 100), + [NL80211_ATTR_HE_6GHZ_CAPABILITY ] = { + .type =NLA_EXACT_LEN , + .len =NL80211_HE_6GHZ_CAPABILITY_LEN , + }, };/* policy for the key attributes */
@@ -6129,6 +6133,10 @@ static int nl80211_new_station(struct sk_buff *skb, struct genl_info *info)return -EINVAL ; } +if (info->attrs[NL80211_ATTR_HE_6GHZ_CAPABILITY ]) + params.he_6ghz_capa = +nla_data (info->attrs[NL80211_ATTR_HE_6GHZ_CAPABILITY ]); +if (info->attrs[NL80211_ATTR_OPMODE_NOTIF ]) { params.opmode_notif_used = true; params.opmode_notif =
@@ -6177,6 +6185,10 @@ static int nl80211_new_station(struct sk_buff *skb, struct genl_info *info)return -EINVAL ; } +/* Ensure that HT/VHT capabilities are not set for 6 GHz HE STA */ +if (params.he_6ghz_capa && (params.ht_capa || params.vht_capa)) +return -EINVAL ; +/* When you run into this, adjust the code below for the new flag */ BUILD_BUG_ON (NL80211_STA_FLAG_MAX !=7 );
Signature · 1 line
2.7.4
PATCH v3 3/11 nl80211: add HE 6 GHz Band Capability support
In reply to Rajkumar ManoharanDefine new structures for HE 6 GHz band capabilities as per IEEE P802.11ax/D6.0, 9.4.2.261 HE 6 GHz Band Capabilities element and 6 GHz Operation Information field of HE operation element (IEEE P802.11ax/D6.0, Figure 9-787k).
--- include/linux/ieee80211.h | 57 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+)
include/linux/ieee80211.h +57 -0
@@ -1632,6 +1632,44 @@ struct ieee80211_he_mcs_nss_supp { } __packed;/** +* enum ieee80211_he_6ghz_chanwidth - HE 6 GHz channel width +* @IEEE80211_HE_6GHZ_CHANWIDTH_20MHZ: 20 MHz bandwidth +* @IEEE80211_HE_6GHZ_CHANWIDTH_40MHZ: 40 MHz bandwidth +* @IEEE80211_HE_6GHZ_CHANWIDTH_80MHZ: 80 MHz bandwidth +* @IEEE80211_HE_6GHZ_CHANWIDTH_80P80MHZ: 160 or 80+80 MHz bandwidth +*/ +enum ieee80211_he_6ghz_chanwidth { +IEEE80211_HE_6GHZ_CHANWIDTH_20MHZ =0 , +IEEE80211_HE_6GHZ_CHANWIDTH_40MHZ =1 , +IEEE80211_HE_6GHZ_CHANWIDTH_80MHZ =2 , +IEEE80211_HE_6GHZ_CHANWIDTH_160MHZ_80P80MHZ =3 , +}; + +/** +* struct ieee80211_he_oper_6ghz_op_info - 6 GHz Operation Information +* +* This structure is defined as described in IEEE P802.11ax/D6.0, +* Figure 9-787k—6 GHz Operation Information field. +* +* @primary_chan: The channel number of the primary channel in the 6 GHz band. +* @control: First two bits defines channel width field indicates the BSS +* channel width and is set to 0 for 20 MHz, 1 for 40 MHz, 2 for 80 MHz, +* and 3 for 80+80 or 160 MHz. +* @center_freq_seg0_idx: Channel center frequency index for the 20 MHz, +* 40 MHz, or 80 MHz, or 80+80 MHz. +* @center_freq_seg1_idx: Channel center frequency index of the 160 MHz. +* @min_rate: Minimum rate, in units of 1 Mb/s, that the non-AP STA is allowed +* to use for sending PPDUs. +*/ +struct ieee80211_he_oper_6ghz_op_info { +u8 primary_chan; +u8 control; +u8 center_freq_seg0_idx; +u8 center_freq_seg1_idx; +u8 min_rate; +} __packed; + +/** * struct ieee80211_he_operation - HE capabilities element * * This structure is the "HE operation element" fields as
@@ -1682,6 +1720,15 @@ struct ieee80211_mu_edca_param_set {struct ieee80211_he_mu_edca_param_ac_rec ac_vo; } __packed; +/** +* struct ieee80211_he_6ghz_band_cap - HE 6 GHz Band Capabilities element +* +* This structure is defined as described in IEEE P802.11ax/D6.0, 9.4.2.261. +*/ +struct ieee80211_he_6ghz_band_cap { +__le16 capab; +} __packed; +/* 802.11ac VHT Capabilities */ #define IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_3895 0x00000000#define IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_7991 0x00000001
@@ -1982,6 +2029,15 @@ int ieee80211_get_vht_max_nss(struct ieee80211_vht_cap *cap,#define IEEE80211_TX_RX_MCS_NSS_SUPP_TX_BITMAP_MASK 0x07c0#define IEEE80211_TX_RX_MCS_NSS_SUPP_RX_BITMAP_MASK 0xf800 +/* 802.11ax HE 6 GHz Band Capability */ +#define IEEE80211_HE_6GHZ_CAP_MIN_MPDU_START_SPACE_MASK GENMASK(2, 0) +#define IEEE80211_HE_6GHZ_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK GENMASK(5, 3) +#define IEEE80211_HE_6GHZ_CAP_MAX_MPDU_LENGTH_MASK GENMASK(7, 6) +#define IEEE80211_HE_6GHZ_CAP_SMPS_MASK GENMASK(10, 9) +#define IEEE80211_HE_6GHZ_CAP_RD_RESP BIT(11) +#define IEEE80211_HE_6GHZ_CAP_RX_ANTENNA_PATTERN BIT(12) +#define IEEE80211_HE_6GHZ_CAP_TX_ANTENNA_PATTERN BIT(13) +/* TX/RX HE MCS Support field Highest MCS subfield encoding */ enum ieee80211_he_highest_mcs_supported_subfield_enc {HIGHEST_MCS_SUPPORTED_MCS7 =0 ,
@@ -2059,6 +2115,7 @@ ieee80211_he_ppe_size(u8 ppe_thres_hdr, const u8 *phy_cap_info)#define IEEE80211_HE_OPERATION_BSS_COLOR_OFFSET 24#define IEEE80211_HE_OPERATION_PARTIAL_BSS_COLOR 0x40000000#define IEEE80211_HE_OPERATION_BSS_COLOR_DISABLED 0x80000000 +#define IEEE80211_HE_OPERATION_6GHZ_OP_INFO_CTRL_CHAN_WIDTH 0x3/* * ieee80211_he_oper_size - calculate 802.11ax HE Operations IE size
Signature · 6 lines
2.7.4 _______________________________________________ ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
PATCH v3 4/11 mac80211: add HE 6 GHz Band Capabilities into parse extension
In reply to Rajkumar ManoharanHandle 6 GHz band capability element parsing for association.
--- include/linux/ieee80211.h | 1 + net/mac80211/ieee80211_i.h | 1 + net/mac80211/util.c | 4 ++++ 3 files changed, 6 insertions(+)
include/linux/ieee80211.h +1 -0
@@ -2614,6 +2614,7 @@ enum ieee80211_eid_ext {WLAN_EID_EXT_MAX_CHANNEL_SWITCH_TIME =52 ,WLAN_EID_EXT_MULTIPLE_BSSID_CONFIGURATION =55 ,WLAN_EID_EXT_NON_INHERITANCE =56 , + WLAN_EID_EXT_HE_6GHZ_BAND_CAP = 59, };/* Action category code */
net/mac80211/ieee80211_i.h +1 -0
@@ -1491,6 +1491,7 @@ struct ieee802_11_elems {const struct ieee80211_he_operation *he_operation;const struct ieee80211_he_spr *he_spr;const struct ieee80211_mu_edca_param_set *mu_edca_param_set; +const struct ieee80211_he_6ghz_band_cap *he_6ghz_cap_elem;const u8 *uora_element;const u8 *mesh_id;const u8 *peering;
net/mac80211/util.c +4 -0
@@ -936,6 +936,10 @@ static void ieee80211_parse_extension_element(u32 *crc, len >= ieee80211_he_spr_size(data)) elems->he_spr = data;break ; +case WLAN_EID_EXT_HE_6GHZ_BAND_CAP : +if (len ==sizeof (struct ieee80211_he_6ghz_band_cap )) + elems->he_6ghz_cap_elem = data; +break ; } }
Signature · 1 line
2.7.4
PATCH v3 5/11 mac80211: fix memory overlap due to variable length param
In reply to Rajkumar ManoharanAs of now HE operation element in bss_conf includes variable length optional field followed by other HE variable. Though the optional field never be used, actually it is referring to next member of the bss_conf structure which is not correct. Fix it by declaring needed HE operation fields within bss_conf itself.
--- drivers/net/wireless/ath/ath11k/mac.c | 3 +-- include/net/mac80211.h | 7 +++++-- net/mac80211/he.c | 13 +++++-------- 3 files changed, 11 insertions(+), 12 deletions(-)
drivers/net/wireless/ath/ath11k/mac.c +1 -2
@@ -1168,8 +1168,7 @@ static void ath11k_peer_assoc_h_he(struct ath11k *ar, sizeof(arg->peer_he_cap_macinfo));memcpy (&arg->peer_he_cap_phyinfo, he_cap->he_cap_elem.phy_cap_info,sizeof (arg->peer_he_cap_phyinfo)); -memcpy (&arg->peer_he_ops, &vif->bss_conf.he_operation, -sizeof (arg->peer_he_ops)); + arg->peer_he_ops = vif->bss_conf.he_oper.params;/* the top most byte is used to indicate BSS color info */ arg->peer_he_ops &=0xffffff ;
include/net/mac80211.h +5 -2
@@ -603,7 +603,7 @@ struct ieee80211_ftm_responder_params {* nontransmitted BSSIDs * @profile_periodicity: the least number of beacon frames need to be received * in order to discover all the nontransmitted BSSIDs in the set. -* @he_operation: HE operation information of the AP we are connected to +* @he_oper: 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 */
@@ -666,7 +666,10 @@ struct ieee80211_bss_conf {u8 bssid_indicator;bool ema_ap;u8 profile_periodicity; -struct ieee80211_he_operation he_operation; +struct { +u32 params; +u16 nss_set; + } he_oper;struct ieee80211_he_obss_pd he_obss_pd;struct cfg80211_he_bss_color he_bss_color; };
net/mac80211/he.c +5 -8
@@ -57,17 +57,14 @@ ieee80211_he_cap_ie_to_sta_he_cap(struct ieee80211_sub_if_data *sdata,void ieee80211_he_op_ie_to_bss_conf (struct ieee80211_vif *vif, -const struct ieee80211_he_operation *he_op_ie_elem) +const struct ieee80211_he_operation *he_op_ie) { -struct ieee80211_he_operation *he_operation = - &vif->bss_conf.he_operation; - -if (!he_op_ie_elem) { -memset (he_operation,0 ,sizeof (*he_operation)); +memset (&vif->bss_conf.he_oper,0 ,sizeof (vif->bss_conf.he_oper)); +if (!he_op_ie)return ; - } - vif->bss_conf.he_operation = *he_op_ie_elem; + vif->bss_conf.he_oper.params =__le32_to_cpu (he_op_ie->he_oper_params); + vif->bss_conf.he_oper.nss_set =__le16_to_cpu (he_op_ie->he_mcs_nss_set); }void
Signature · 1 line
2.7.4
PATCH v3 6/11 mac80211: handle HE 6 GHz Capability in HE STA processing
In reply to Rajkumar ManoharanDuring association or mesh peering of HE STA in 6 GHz band, required HT/VHT information has to be processed from 6 GHz band capabilities as HT/VHT IEs are not allowed in 6 GHz.
--- include/net/cfg80211.h | 10 +++++++++ net/mac80211/cfg.c | 3 ++- net/mac80211/he.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++ net/mac80211/ieee80211_i.h | 2 ++ net/mac80211/mesh_plink.c | 4 +++- net/mac80211/mlme.c | 1 + 6 files changed, 69 insertions(+), 2 deletions(-)
include/net/cfg80211.h +10 -0
@@ -332,15 +332,25 @@ struct ieee80211_sta_vht_cap {* to describe 802.11ax HE capabilities for a STA. * * @has_he: true iff HE data is valid. +* @has_he_6ghz: true iff HE 6 GHz data is valid. * @he_cap_elem: Fixed portion of the HE capabilities element. * @he_mcs_nss_supp: The supported NSS/MCS combinations. * @ppe_thres: Holds the PPE Thresholds data. +* @ampdu_factor: Maximum A-MPDU length factor used in 6 GHz. +* @ampdu_density: Minimum A-MPDU spacing used in 6 GHz. +* @cap: HE 6 GHz Band capability. */ struct ieee80211_sta_he_cap {bool has_he; +bool has_he_6ghz;struct ieee80211_he_cap_elem he_cap_elem;struct ieee80211_he_mcs_nss_supp he_mcs_nss_supp;u8 ppe_thres[IEEE80211_HE_PPE_THRES_MAX_LEN ]; +struct { +u8 ampdu_factor; +u8 ampdu_density; +u16 cap; + } he_6ghz; };/**
net/mac80211/cfg.c +2 -1
@@ -1508,7 +1508,8 @@ static int sta_apply_parameters(struct ieee80211_local *local,if (params->he_capa)ieee80211_he_cap_ie_to_sta_he_cap (sdata, sband, (void *)params->he_capa, - params->he_capa_len, sta); + params->he_capa_len, + params->he_6ghz_capa, sta);if (params->opmode_notif_used) {/* returned value is only needed for rc update, but the
net/mac80211/he.c +51 -0
67 lines not on this page · raw message
net/mac80211/ieee80211_i.h +2 -0
@@ -1892,6 +1892,8 @@ void ieee80211_he_cap_ie_to_sta_he_cap(struct ieee80211_sub_if_data *sdata, struct ieee80211_supported_band *sband, const u8 *he_cap_ie, u8 he_cap_len, + const struct ieee80211_he_6ghz_band_cap + *he_6ghz_cap_ie, struct sta_info *sta); void ieee80211_he_spr_ie_to_bss_conf(struct ieee80211_vif *vif,
net/mac80211/mesh_plink.c +3 -1
@@ -441,7 +441,9 @@ static void mesh_sta_info_init(struct ieee80211_sub_if_data *sdata, elems->vht_cap_elem, sta);ieee80211_he_cap_ie_to_sta_he_cap (sdata, sband, elems->he_cap, - elems->he_cap_len, sta); + elems->he_cap_len, + elems->he_6ghz_cap_elem, + sta);if (bw != sta->sta.bandwidth) changed |=IEEE80211_RC_BW_CHANGED ;
net/mac80211/mlme.c +1 -0
@@ -3381,6 +3381,7 @@ static bool ieee80211_assoc_success(struct ieee80211_sub_if_data *sdata,ieee80211_he_cap_ie_to_sta_he_cap (sdata, sband, elems->he_cap, elems->he_cap_len, + elems->he_6ghz_cap_elem, sta); bss_conf->he_support = sta->sta.he_cap.has_he;
Signature · 1 line
2.7.4
PATCH v3 7/11 mac80211: add HE 6 GHz Band Capability IE in Assoc. Request
In reply to Rajkumar ManoharanConstruct HE 6 GHz band capability element element (IEEE 802.11ax/D6.0, 9.4.2.261) for association request and mesh beacon. The 6 GHz capability information is passed by driver through iftypes caps.
--- net/mac80211/ieee80211_i.h | 1 + net/mac80211/mesh.c | 34 ++++++++++++++++++++++++++++++++++ net/mac80211/mesh.h | 2 ++ net/mac80211/mesh_plink.c | 3 ++- net/mac80211/mlme.c | 12 ++++++++++-- net/mac80211/util.c | 15 +++++++++++++++ 6 files changed, 64 insertions(+), 3 deletions(-)
net/mac80211/ieee80211_i.h +1 -0
@@ -2174,6 +2174,7 @@ u8 ieee80211_ie_len_he_cap(struct ieee80211_sub_if_data *sdata, u8 iftype);u8 *ieee80211_ie_build_he_cap (u8 *pos,const struct ieee80211_sta_he_cap *he_cap,u8 *end); +u8 *ieee80211_ie_build_he_6ghz_band_cap (u8 *pos,u16 he_6ghz_cap);u8 *ieee80211_ie_build_he_oper (u8 *pos); int ieee80211_parse_bitrates(struct cfg80211_chan_def *chandef, const struct ieee80211_supported_band *sband,
net/mac80211/mesh.c +34 -0
@@ -587,6 +587,39 @@ int mesh_add_he_oper_ie(struct ieee80211_sub_if_data *sdata,return 0 ; } +int mesh_add_he_6ghz_cap_ie (struct ieee80211_sub_if_data *sdata, +struct sk_buff *skb) +{ +const struct ieee80211_sta_he_cap *he_cap; +struct ieee80211_supported_band *sband; +u8 ie_len; +u8 *pos; + + sband =ieee80211_get_sband (sdata); +if (!sband) +return -EINVAL ; + + he_cap =ieee80211_get_he_iftype_cap (sband,NL80211_IFTYPE_MESH_POINT ); + +if (!he_cap || + sdata->vif.bss_conf.chandef.width ==NL80211_CHAN_WIDTH_20_NOHT || + sdata->vif.bss_conf.chandef.width ==NL80211_CHAN_WIDTH_5 || + sdata->vif.bss_conf.chandef.width ==NL80211_CHAN_WIDTH_10 ) +return 0 ; + +if (!he_cap->has_he_6ghz) +return 0 ; + + ie_len =2 +1 +sizeof (struct ieee80211_he_6ghz_band_cap ); +if (skb_tailroom (skb) < ie_len) +return -ENOMEM ; + + pos =skb_put (skb, ie_len); +ieee80211_ie_build_he_6ghz_band_cap (pos, he_cap->he_6ghz.cap); + +return 0 ; +} +static void ieee80211_mesh_path_timer (struct timer_list *t) { struct ieee80211_sub_if_data *sdata =
@@ -885,6 +918,7 @@ ieee80211_mesh_build_beacon(struct ieee80211_if_mesh *ifmsh)mesh_add_vht_oper_ie (sdata, skb) ||mesh_add_he_cap_ie (sdata, skb, ie_len_he_cap) ||mesh_add_he_oper_ie (sdata, skb) || +mesh_add_he_6ghz_cap_ie (sdata, skb) || mesh_add_vendor_ies(sdata, skb)) goto out_free;
net/mac80211/mesh.h +2 -0
@@ -222,6 +222,8 @@ int mesh_add_he_cap_ie(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb, u8 ie_len);int mesh_add_he_oper_ie (struct ieee80211_sub_if_data *sdata,struct sk_buff *skb); +int mesh_add_he_6ghz_cap_ie (struct ieee80211_sub_if_data *sdata, +struct sk_buff *skb);void mesh_rmc_free (struct ieee80211_sub_if_data *sdata);int mesh_rmc_init (struct ieee80211_sub_if_data *sdata);void ieee80211s_init (void );
net/mac80211/mesh_plink.c +2 -1
@@ -328,7 +328,8 @@ static int mesh_plink_frame_tx(struct ieee80211_sub_if_data *sdata,mesh_add_vht_cap_ie (sdata, skb) ||mesh_add_vht_oper_ie (sdata, skb) ||mesh_add_he_cap_ie (sdata, skb, ie_len_he_cap) || - mesh_add_he_oper_ie(sdata, skb)) +mesh_add_he_oper_ie (sdata, skb) || + mesh_add_he_6ghz_cap_ie(sdata, skb)) goto free; }
net/mac80211/mlme.c +10 -2
@@ -654,6 +654,12 @@ static void ieee80211_add_he_ie(struct ieee80211_sub_if_data *sdata, he_cap->he_cap_elem.phy_cap_info); pos =skb_put (skb, he_cap_size);ieee80211_ie_build_he_cap (pos, he_cap, pos + he_cap_size); + +if (!he_cap->has_he_6ghz) +return ; + + pos =skb_put (skb,5 );/* 2 + 1 + sizeof(he_cap->he_6ghz.cap) */ +ieee80211_ie_build_he_6ghz_band_cap (pos, he_cap->he_6ghz.cap); }static void ieee80211_send_assoc (struct ieee80211_sub_if_data *sdata)
@@ -4803,7 +4809,8 @@ static int ieee80211_prep_channel(struct ieee80211_sub_if_data *sdata,if (!sband->ht_cap.ht_supported) { ifmgd->flags |=IEEE80211_STA_DISABLE_HT ; ifmgd->flags |=IEEE80211_STA_DISABLE_VHT ; - ifmgd->flags |=IEEE80211_STA_DISABLE_HE ; +if (sband->band !=NL80211_BAND_6GHZ ) + ifmgd->flags |=IEEE80211_STA_DISABLE_HE ; }if (!sband->vht_cap.vht_supported)
@@ -5493,7 +5500,8 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata,if (req->flags &ASSOC_REQ_DISABLE_HT ) { ifmgd->flags |=IEEE80211_STA_DISABLE_HT ; ifmgd->flags |=IEEE80211_STA_DISABLE_VHT ; - ifmgd->flags |=IEEE80211_STA_DISABLE_HE ; +if (sband->band !=NL80211_BAND_6GHZ ) + ifmgd->flags |=IEEE80211_STA_DISABLE_HE ; }if (req->flags &ASSOC_REQ_DISABLE_VHT )
net/mac80211/util.c +15 -0
@@ -2839,6 +2839,21 @@ u8 *ieee80211_ie_build_he_cap(u8 *pos,return pos; } +u8 *ieee80211_ie_build_he_6ghz_band_cap (u8 *pos,u16 he_6ghz_cap) +{ +__le16 cap =cpu_to_le16 (he_6ghz_cap); + + *pos++ =WLAN_EID_EXTENSION ; + *pos++ =3 ; + *pos++ =WLAN_EID_EXT_HE_6GHZ_BAND_CAP ; + +/* Fixed data */ +memcpy (pos, &cap,sizeof (cap)); + pos +=sizeof (cap); + +return pos; +} +u8 *ieee80211_ie_build_ht_oper (u8 *pos,struct ieee80211_sta_ht_cap *ht_cap,const struct cfg80211_chan_def *chandef,u16 prot_mode,bool rifs_mode)
Signature · 6 lines
2.7.4 _______________________________________________ ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
PATCH v3 8/11 mac80211: build HE operation with 6 GHz oper information
In reply to Rajkumar ManoharanAdd 6 GHz operation information (IEEE 802.11ax/D6.0, Figure 9-787k) while building HE operation element for non-HE AP. This field is used to determine channel information in the absence of HT/VHT IEs.
--- net/mac80211/ieee80211_i.h | 2 +- net/mac80211/mesh.c | 11 +++++--- net/mac80211/util.c | 63 +++++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 68 insertions(+), 8 deletions(-)
net/mac80211/ieee80211_i.h +1 -1
@@ -2175,7 +2175,7 @@ u8 *ieee80211_ie_build_he_cap(u8 *pos,const struct ieee80211_sta_he_cap *he_cap, u8 *end);u8 *ieee80211_ie_build_he_6ghz_band_cap (u8 *pos,u16 he_6ghz_cap); -u8 *ieee80211_ie_build_he_oper (u8 *pos); +u8 *ieee80211_ie_build_he_oper (u8 *pos,struct cfg80211_chan_def *chandef);int ieee80211_parse_bitrates (struct cfg80211_chan_def *chandef,const struct ieee80211_supported_band *sband,const u8 *srates,int srates_len,u32 *rates);
net/mac80211/mesh.c +8 -3
@@ -565,6 +565,7 @@ int mesh_add_he_oper_ie(struct ieee80211_sub_if_data *sdata, {const struct ieee80211_sta_he_cap *he_cap;struct ieee80211_supported_band *sband; +u32 len;u8 *pos; sband =ieee80211_get_sband (sdata);
@@ -578,11 +579,15 @@ int mesh_add_he_oper_ie(struct ieee80211_sub_if_data *sdata, sdata->vif.bss_conf.chandef.width == NL80211_CHAN_WIDTH_10)return 0 ; -if (skb_tailroom (skb) <2 +1 +sizeof (struct ieee80211_he_operation )) + len =2 +1 +sizeof (struct ieee80211_he_operation ); +if (sdata->vif.bss_conf.chandef.chan->band ==NL80211_BAND_6GHZ ) + len +=sizeof (struct ieee80211_he_oper_6ghz_op_info ); + +if (skb_tailroom (skb) < len)return -ENOMEM ; - pos =skb_put (skb,2 +1 +sizeof (struct ieee80211_he_operation )); -ieee80211_ie_build_he_oper (pos); + pos =skb_put (skb, len); +ieee80211_ie_build_he_oper (pos, &sdata->vif.bss_conf.chandef);return 0 ; }
net/mac80211/util.c +59 -4
88 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH v3 9/11 mac80211: do not allow HT/VHT IEs in 6 GHz mesh mode
In reply to Rajkumar ManoharanAs HT/VHT elements are not allowed in 6 GHz band, do not include them in mesh beacon template formation.
--- net/mac80211/mesh.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
net/mac80211/mesh.c +16 -0
@@ -415,6 +415,10 @@ int mesh_add_ht_cap_ie(struct ieee80211_sub_if_data *sdata,if (!sband)return -EINVAL ; +/* HT not allowed in 6 GHz */ +if (sband->band ==NL80211_BAND_6GHZ ) +return 0 ; + if (!sband->ht_cap.ht_supported || sdata->vif.bss_conf.chandef.width == NL80211_CHAN_WIDTH_20_NOHT || sdata->vif.bss_conf.chandef.width == NL80211_CHAN_WIDTH_5 ||
@@ -452,6 +456,10 @@ int mesh_add_ht_oper_ie(struct ieee80211_sub_if_data *sdata, sband = local->hw.wiphy->bands[channel->band]; ht_cap = &sband->ht_cap; +/* HT not allowed in 6 GHz */ +if (sband->band ==NL80211_BAND_6GHZ ) +return 0 ; + if (!ht_cap->ht_supported || sdata->vif.bss_conf.chandef.width == NL80211_CHAN_WIDTH_20_NOHT || sdata->vif.bss_conf.chandef.width == NL80211_CHAN_WIDTH_5 ||
@@ -479,6 +487,10 @@ int mesh_add_vht_cap_ie(struct ieee80211_sub_if_data *sdata,if (!sband)return -EINVAL ; +/* VHT not allowed in 6 GHz */ +if (sband->band ==NL80211_BAND_6GHZ ) +return 0 ; + if (!sband->vht_cap.vht_supported || sdata->vif.bss_conf.chandef.width == NL80211_CHAN_WIDTH_20_NOHT || sdata->vif.bss_conf.chandef.width == NL80211_CHAN_WIDTH_5 ||
@@ -516,6 +528,10 @@ int mesh_add_vht_oper_ie(struct ieee80211_sub_if_data *sdata, sband = local->hw.wiphy->bands[channel->band]; vht_cap = &sband->vht_cap; +/* VHT not allowed in 6 GHz */ +if (sband->band ==NL80211_BAND_6GHZ ) +return 0 ; + if (!vht_cap->vht_supported || sdata->vif.bss_conf.chandef.width == NL80211_CHAN_WIDTH_20_NOHT || sdata->vif.bss_conf.chandef.width == NL80211_CHAN_WIDTH_5 ||
Signature · 1 line
2.7.4
PATCH v3 10/11 mac80211: determine chantype from HE operation in 6 GHz
In reply to Rajkumar ManoharanIn 6 GHz band, determine chandef from 6 GHz operation information of HE operation element.
--- net/mac80211/ieee80211_i.h | 3 ++ net/mac80211/mesh.c | 1 + net/mac80211/mlme.c | 12 ++++++ net/mac80211/util.c | 96 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 112 insertions(+)
net/mac80211/ieee80211_i.h +3 -0
@@ -2194,6 +2194,9 @@ bool ieee80211_chandef_vht_oper(struct ieee80211_hw *hw,const struct ieee80211_vht_operation *oper, const struct ieee80211_ht_operation *htop, struct cfg80211_chan_def *chandef); +bool ieee80211_chandef_he_oper (struct ieee80211_sub_if_data *sdata, +const struct ieee80211_he_operation *heop, +struct cfg80211_chan_def *chandef);u32 ieee80211_chandef_downgrade (struct cfg80211_chan_def *c);int __must_check
net/mac80211/mesh.c +1 -0
@@ -99,6 +99,7 @@ bool mesh_matches_local(struct ieee80211_sub_if_data *sdata,ieee80211_chandef_vht_oper (&sdata->local->hw, ie->vht_operation, ie->ht_operation, &sta_chan_def); +ieee80211_chandef_he_oper (sdata, ie->he_operation, &sta_chan_def);if (!cfg80211_chandef_compatible (&sdata->vif.bss_conf.chandef, &sta_chan_def))
net/mac80211/mlme.c +12 -0
@@ -163,6 +163,9 @@ ieee80211_determine_chantype(struct ieee80211_sub_if_data *sdata, chandef->width =NL80211_CHAN_WIDTH_20_NOHT ; chandef->center_freq1 = channel->center_freq; +if (channel->band ==NL80211_BAND_6GHZ ) + goto skip_ht_vht_oper; +if (!ht_oper || !sta_ht_cap.ht_supported) { ret =IEEE80211_STA_DISABLE_HT | IEEE80211_STA_DISABLE_VHT |
@@ -263,6 +266,15 @@ ieee80211_determine_chantype(struct ieee80211_sub_if_data *sdata, *chandef = vht_chandef; +skip_ht_vht_oper: +if (!ieee80211_chandef_he_oper (sdata, he_oper, chandef)) { +if (!(ifmgd->flags &IEEE80211_STA_DISABLE_HE )) +sdata_info (sdata, +"AP HE information is invalid, disable HE\n" ); + ret =IEEE80211_STA_DISABLE_HE ; + goto out; + } + ret =0 ; out:
net/mac80211/util.c +96 -0
102 lines not on this page · raw message
Signature · 6 lines
2.7.4 _______________________________________________ ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
PATCH v3 11/11 ath11k: build HE 6 GHz capability
In reply to Rajkumar ManoharanBuild 6 GHz band capability from HT and VHT capabilities reported by firmware.
--- drivers/net/wireless/ath/ath11k/core.h | 1 + drivers/net/wireless/ath/ath11k/mac.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+)
drivers/net/wireless/ath/ath11k/core.h +1 -0
@@ -537,6 +537,7 @@ struct ath11k_band_cap {u32 he_mcs;u32 he_cap_phy_info[PSOC_HOST_MAX_PHY_SIZE ];struct ath11k_ppe_threshold he_ppet; +u16 he_6ghz_cap; };struct ath11k_pdev_cap {
drivers/net/wireless/ath/ath11k/mac.c +34 -0
@@ -3522,6 +3522,34 @@ ath11k_mac_filter_he_cap_mesh(struct ieee80211_he_cap_elem *he_cap_elem) he_cap_elem->phy_cap_info[9 ] &= ~m; } +static u16 ath11k_mac_setup_he_6ghz_cap (struct ath11k_pdev_cap *pcap, +struct ath11k_band_cap *bcap) +{ +u8 val; + + bcap->he_6ghz_cap =IEEE80211_HT_MPDU_DENSITY_NONE ; +if (bcap->ht_cap_info &WMI_HT_CAP_DYNAMIC_SMPS ) + bcap->he_6ghz_cap |= +FIELD_PREP (IEEE80211_HE_6GHZ_CAP_SMPS_MASK , +WLAN_HT_CAP_SM_PS_DYNAMIC ); + val =FIELD_GET (IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK , + pcap->vht_cap); + bcap->he_6ghz_cap |= +FIELD_PREP (IEEE80211_HE_6GHZ_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK , + val); + val =FIELD_GET (IEEE80211_VHT_CAP_MAX_MPDU_MASK , pcap->vht_cap); + bcap->he_6ghz_cap |= +FIELD_PREP (IEEE80211_HE_6GHZ_CAP_MAX_MPDU_LENGTH_MASK , val); +if (pcap->vht_cap &IEEE80211_VHT_CAP_RX_ANTENNA_PATTERN ) + bcap->he_6ghz_cap |= +IEEE80211_HE_6GHZ_CAP_RX_ANTENNA_PATTERN ; +if (pcap->vht_cap &IEEE80211_VHT_CAP_TX_ANTENNA_PATTERN ) + bcap->he_6ghz_cap |= +IEEE80211_HE_6GHZ_CAP_TX_ANTENNA_PATTERN ; + +return bcap->he_6ghz_cap; +} + static int ath11k_mac_copy_he_cap(struct ath11k *ar, struct ath11k_pdev_cap *cap, struct ieee80211_sband_iftype_data *data,
@@ -3602,6 +3630,12 @@ static int ath11k_mac_copy_he_cap(struct ath11k *ar, IEEE80211_HE_PHY_CAP6_PPE_THRESHOLD_PRESENT) ath11k_gen_ppe_thresh(&band_cap->he_ppet, he_cap->ppe_thres); + +if (band ==NL80211_BAND_6GHZ ) { + he_cap->has_he_6ghz = true; + he_cap->he_6ghz.cap = +ath11k_mac_setup_he_6ghz_cap (cap, band_cap); + } idx++; }
Signature · 1 line
2.7.4