Commit 24a2042c authored by Rajkumar Manoharan's avatar Rajkumar Manoharan Committed by Johannes Berg
Browse files

mac80211: add HE 6 GHz Band Capability element 



Construct HE 6 GHz band capability 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.

Signed-off-by: default avatarRajkumar Manoharan <rmanohar@codeaurora.org>
Link: https://lore.kernel.org/r/1589399105-25472-7-git-send-email-rmanohar@codeaurora.org
[handle SMPS, adjust for previous patches, reserve SKB space properly,
 change to handle SKB directly]
Link: https://lore.kernel.org/r/20200528213443.643aa8101111.I3f9747c1147480f65445f13eda5c4a5ed4e86757@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 22395217

net/mac80211/ieee80211_i.h

+2 −0
Original line number Diff line number Diff line
@@ -2177,6 +2177,8 @@ 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);

void ieee80211_ie_build_he_6ghz_cap(struct ieee80211_sub_if_data *sdata,

				    struct sk_buff *skb);

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

+9 −0
Original line number Diff line number Diff line
@@ -587,6 +587,13 @@ 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)

{

	ieee80211_ie_build_he_6ghz_cap(sdata, skb);

	return 0;

}



static void ieee80211_mesh_path_timer(struct timer_list *t)

{

	struct ieee80211_sub_if_data *sdata =
@@ -766,6 +773,7 @@ ieee80211_mesh_build_beacon(struct ieee80211_if_mesh *ifmsh) 
		   2 + sizeof(struct ieee80211_vht_operation) +

		   ie_len_he_cap +

		   2 + 1 + sizeof(struct ieee80211_he_operation) +

		   2 + 1 + sizeof(struct ieee80211_he_6ghz_capa) +

		   ifmsh->ie_len;



	bcn = kzalloc(sizeof(*bcn) + head_len + tail_len, GFP_KERNEL);
@@ -885,6 +893,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
Original line number Diff line number Diff line
@@ -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

+3 −1
Original line number Diff line number Diff line
@@ -238,6 +238,7 @@ static int mesh_plink_frame_tx(struct ieee80211_sub_if_data *sdata, 
			    2 + sizeof(struct ieee80211_vht_operation) +

			    ie_len_he_cap +

			    2 + 1 + sizeof(struct ieee80211_he_operation) +

			    2 + 1 + sizeof(struct ieee80211_he_6ghz_capa) +

			    2 + 8 + /* peering IE */

			    sdata->u.mesh.ie_len);

	if (!skb)
@@ -328,7 +329,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

+3 −0
Original line number Diff line number Diff line
@@ -658,6 +658,8 @@ 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);



	ieee80211_ie_build_he_6ghz_cap(sdata, skb);

}



static void ieee80211_send_assoc(struct ieee80211_sub_if_data *sdata)
@@ -731,6 +733,7 @@ static void ieee80211_send_assoc(struct ieee80211_sub_if_data *sdata) 
			2 + 1 + sizeof(struct ieee80211_he_cap_elem) + /* HE */

				sizeof(struct ieee80211_he_mcs_nss_supp) +

				IEEE80211_HE_PPE_THRES_MAX_LEN +

			2 + 1 + sizeof(struct ieee80211_he_6ghz_capa) +

			assoc_data->ie_len + /* extra IEs */

			(assoc_data->fils_kek_len ? 16 /* AES-SIV */ : 0) +

			9, /* WMM */

CRA Git | Maintained and supported by SUSTech CRA and CCSE