Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b383779d authored by Rajkumar Manoharan's avatar Rajkumar Manoharan Committed by Gerrit - the friendly Code Review server
Browse files

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.

Signed-off-by: default avatarRajkumar Manoharan <rmanohar@codeaurora.org>
Link: https://lore.kernel.org/r/1589399105-25472-2-git-send-email-rmanohar@codeaurora.org
Link: https://lore.kernel.org/r/20200528213443.b6b711fd4312.Ic9b97d57b6c4f2b28d4b2d23d2849d8bc20bd8cc@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Git-commit: 43e64bf301fd8c54f0082d91c6ffd4de861baf96
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git


CRs-Fixed: 2743684
Change-Id: I79d7a6f1994ca7cd39b3c5f950a52e40cb769971
Signed-off-by: default avatarVinita S. Maloo <vmaloo@codeaurora.org>
parent e82a4c9f

include/net/cfg80211.h

+2 −0
Original line number Diff line number Diff line
@@ -1110,6 +1110,7 @@ enum station_parameters_apply_mask { 
 * @support_p2p_ps: information if station supports P2P PS mechanism

 * @he_capa: HE capabilities of station

 * @he_capa_len: the length of the HE capabilities

 * @he_6ghz_capa: HE 6 GHz Band capabilities of station

 */

struct station_parameters {

	const u8 *supported_rates;
@@ -1139,6 +1140,7 @@ struct station_parameters { 
	int support_p2p_ps;

	const struct ieee80211_he_cap_elem *he_capa;

	u8 he_capa_len;

	const struct ieee80211_he_6ghz_capa *he_6ghz_capa;

};



/**

include/uapi/linux/nl80211.h

+5 −0
Original line number Diff line number Diff line
@@ -2351,6 +2351,9 @@ enum nl80211_commands { 
 *	%NL80211_ATTR_AKM_SUITES are default capabilities if AKM suites not

 *	advertised for a specific interface type.

 *

 * @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
@@ -2818,6 +2821,8 @@ enum nl80211_attrs { 
	NL80211_ATTR_HE_BSS_COLOR,



	NL80211_ATTR_IFTYPE_AKM_SUITES,

	NL80211_ATTR_HE_6GHZ_CAPABILITY =

	NL80211_ATTR_WIPHY_EDMG_BW_CONFIG + 12,



	/* add attributes here, update the policy in nl80211.c */

net/wireless/nl80211.c

+17 −1
Original line number Diff line number Diff line
@@ -471,6 +471,10 @@ static const struct nla_policy nl80211_policy[NUM_NL80211_ATTR] = { 
	[NL80211_ATTR_TXQ_QUANTUM] = { .type = NLA_U32 },

	[NL80211_ATTR_HE_CAPABILITY] = { .type = NLA_BINARY,

					 .len = NL80211_HE_MAX_CAPABILITY_LEN },

	[NL80211_ATTR_HE_6GHZ_CAPABILITY] = {

		.type = NLA_EXACT_LEN,

		.len = sizeof(struct ieee80211_he_6ghz_capa),

	},

};



/* policy for the key attributes */
@@ -5457,6 +5461,10 @@ static int nl80211_set_station(struct sk_buff *skb, struct genl_info *info) 
			nla_get_u8(info->attrs[NL80211_ATTR_OPMODE_NOTIF]);

	}



	if (info->attrs[NL80211_ATTR_HE_6GHZ_CAPABILITY])

		params.he_6ghz_capa =

			nla_data(info->attrs[NL80211_ATTR_HE_CAPABILITY]);



	/* Include parameters for TDLS peer (will check later) */

	err = nl80211_set_station_tdls(info, &params);

	if (err)
@@ -5582,6 +5590,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 =
@@ -5616,10 +5628,14 @@ static int nl80211_new_station(struct sk_buff *skb, struct genl_info *info) 
		params.vht_capa = NULL;



		/* HE requires WME */

		if (params.he_capa_len)

		if (params.he_capa_len || params.he_6ghz_capa)

			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);