Commit 1d00ce80 authored by Thomas Pedersen's avatar Thomas Pedersen Committed by Johannes Berg
Browse files

mac80211: support S1G association 



The changes required for associating in S1G are:

- apply S1G BSS channel info before assoc
- mark all S1G STAs as QoS STAs
- include and parse AID request element
- handle new Association Response format
- don't fail assoc if supported rates element is missing

Signed-off-by: default avatarThomas Pedersen <thomas@adapt-ip.com>
Link: https://lore.kernel.org/r/20200922022818.15855-15-thomas@adapt-ip.com


[pass skb to ieee80211_add_aid_request_ie(), remove unused variable 'bss']
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 09a740ce

include/linux/ieee80211.h

+21 −0
Original line number Diff line number Diff line
@@ -987,6 +987,25 @@ enum ieee80211_vht_opmode_bits { 
	IEEE80211_OPMODE_NOTIF_RX_NSS_TYPE_BF	= 0x80,

};



/**

 * enum ieee80211_s1g_chanwidth

 * These are defined in IEEE802.11-2016ah Table 10-20

 * as BSS Channel Width

 *

 * @IEEE80211_S1G_CHANWIDTH_1MHZ: 1MHz operating channel

 * @IEEE80211_S1G_CHANWIDTH_2MHZ: 2MHz operating channel

 * @IEEE80211_S1G_CHANWIDTH_4MHZ: 4MHz operating channel

 * @IEEE80211_S1G_CHANWIDTH_8MHZ: 8MHz operating channel

 * @IEEE80211_S1G_CHANWIDTH_16MHZ: 16MHz operating channel

 */

enum ieee80211_s1g_chanwidth {

	IEEE80211_S1G_CHANWIDTH_1MHZ = 0,

	IEEE80211_S1G_CHANWIDTH_2MHZ = 1,

	IEEE80211_S1G_CHANWIDTH_4MHZ = 3,

	IEEE80211_S1G_CHANWIDTH_8MHZ = 7,

	IEEE80211_S1G_CHANWIDTH_16MHZ = 15,

};



#define WLAN_SA_QUERY_TR_ID_LEN 2

#define WLAN_MEMBERSHIP_LEN 8

#define WLAN_USER_POSITION_LEN 16
@@ -2854,6 +2873,8 @@ enum ieee80211_eid { 


	WLAN_EID_REDUCED_NEIGHBOR_REPORT = 201,



	WLAN_EID_AID_REQUEST = 210,

	WLAN_EID_AID_RESPONSE = 211,

	WLAN_EID_S1G_BCN_COMPAT = 213,

	WLAN_EID_S1G_SHORT_BCN_INTERVAL = 214,

	WLAN_EID_S1G_CAPABILITIES = 217,

include/net/mac80211.h

+2 −0
Original line number Diff line number Diff line
@@ -627,6 +627,7 @@ struct ieee80211_fils_discovery { 
 * @fils_discovery: FILS discovery configuration

 * @unsol_bcast_probe_resp_interval: Unsolicited broadcast probe response

 *	interval.

 * @s1g: BSS is S1G BSS (affects Association Request format).

 */

struct ieee80211_bss_conf {

	const u8 *bssid;
@@ -696,6 +697,7 @@ struct ieee80211_bss_conf { 
	struct cfg80211_he_bss_color he_bss_color;

	struct ieee80211_fils_discovery fils_discovery;

	u32 unsol_bcast_probe_resp_interval;

	bool s1g;

};



/**

net/mac80211/cfg.c

+2 −0
Original line number Diff line number Diff line
@@ -1124,6 +1124,8 @@ static int ieee80211_start_ap(struct wiphy *wiphy, struct net_device *dev, 
	       sizeof(struct ieee80211_he_obss_pd));

	memcpy(&sdata->vif.bss_conf.he_bss_color, &params->he_bss_color,

	       sizeof(struct ieee80211_he_bss_color));

	sdata->vif.bss_conf.s1g = params->chandef.chan->band ==

				  NL80211_BAND_S1GHZ;



	sdata->vif.bss_conf.ssid_len = params->ssid_len;

	if (params->ssid_len)

net/mac80211/ibss.c

+2 −1
Original line number Diff line number Diff line
@@ -1037,7 +1037,8 @@ static void ieee80211_update_sta_info(struct ieee80211_sub_if_data *sdata, 
	}



	if (sta && !sta->sta.wme &&

	    elems->wmm_info && local->hw.queues >= IEEE80211_NUM_ACS) {

	    (elems->wmm_info || elems->s1g_capab) &&

	    local->hw.queues >= IEEE80211_NUM_ACS) {

		sta->sta.wme = true;

		ieee80211_check_fast_xmit(sta);

	}

net/mac80211/ieee80211_i.h

+5 −0
Original line number Diff line number Diff line
@@ -1538,6 +1538,7 @@ struct ieee802_11_elems { 
	const struct ieee80211_s1g_cap *s1g_capab;

	const struct ieee80211_s1g_oper_ie *s1g_oper;

	const struct ieee80211_s1g_bcn_compat_ie *s1g_bcn_compat;

	const struct ieee80211_aid_response_ie *aid_resp;



	/* length of them, respectively */

	u8 ext_capab_len;
@@ -2213,6 +2214,8 @@ u8 *ieee80211_add_wmm_info_ie(u8 *buf, u8 qosinfo); 
void ieee80211_add_s1g_capab_ie(struct ieee80211_sub_if_data *sdata,

				struct ieee80211_sta_s1g_cap *caps,

				struct sk_buff *skb);

void ieee80211_add_aid_request_ie(struct ieee80211_sub_if_data *sdata,

				  struct sk_buff *skb);



/* channel management */

bool ieee80211_chandef_ht_oper(const struct ieee80211_ht_operation *ht_oper,
@@ -2224,6 +2227,8 @@ bool ieee80211_chandef_vht_oper(struct ieee80211_hw *hw, u32 vht_cap_info, 
bool ieee80211_chandef_he_6ghz_oper(struct ieee80211_sub_if_data *sdata,

				    const struct ieee80211_he_operation *he_oper,

				    struct cfg80211_chan_def *chandef);

bool ieee80211_chandef_s1g_oper(const struct ieee80211_s1g_oper_ie *oper,

				struct cfg80211_chan_def *chandef);

u32 ieee80211_chandef_downgrade(struct cfg80211_chan_def *c);



int __must_check