Commit 43e64bf3 authored by Rajkumar Manoharan's avatar Rajkumar Manoharan Committed by Johannes Berg
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
[handle nl80211_set_station, require WME,
 remove NL80211_HE_6GHZ_CAPABILITY_LEN]
Link: https://lore.kernel.org/r/20200528213443.b6b711fd4312.Ic9b97d57b6c4f2b28d4b2d23d2849d8bc20bd8cc@changeid


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

include/net/cfg80211.h

+2 −0
Original line number Diff line number Diff line
@@ -1238,6 +1238,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;
@@ -1270,6 +1271,7 @@ struct station_parameters { 
	u8 he_capa_len;

	u16 airtime_weight;

	struct sta_txpwr txpwr;

	const struct ieee80211_he_6ghz_capa *he_6ghz_capa;

};



/**

include/uapi/linux/nl80211.h

+5 −0
Original line number Diff line number Diff line
@@ -2502,6 +2502,9 @@ enum nl80211_commands { 
 *	first channel segment specified in %NL80211_ATTR_CENTER_FREQ1.

 * @NL80211_ATTR_SCAN_FREQ_KHZ: nested attribute with KHz frequencies

 *

 * @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
@@ -2982,6 +2985,8 @@ enum nl80211_attrs { 
	NL80211_ATTR_CENTER_FREQ1_OFFSET,

	NL80211_ATTR_SCAN_FREQ_KHZ,



	NL80211_ATTR_HE_6GHZ_CAPABILITY,



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



	__NL80211_ATTR_AFTER_LAST,

net/wireless/nl80211.c

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

	[NL80211_ATTR_WIPHY_FREQ_OFFSET] = NLA_POLICY_RANGE(NLA_U32, 0, 999),

	[NL80211_ATTR_SCAN_FREQ_KHZ] = { .type = NLA_NESTED },

	[NL80211_ATTR_HE_6GHZ_CAPABILITY] = {

		.type = NLA_EXACT_LEN,

		.len = sizeof(struct ieee80211_he_6ghz_capa),

	},

};



/* policy for the key attributes */
@@ -5989,6 +5993,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]);



	if (info->attrs[NL80211_ATTR_AIRTIME_WEIGHT])

		params.airtime_weight =

			nla_get_u16(info->attrs[NL80211_ATTR_AIRTIME_WEIGHT]);
@@ -6123,6 +6131,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 =
@@ -6167,10 +6179,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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE