Commit 3f29fea0 authored Aug 24, 2020 by Johannes Berg Committed by nakul kachhwaha Nov 17, 2020

nl80211: fix NL80211_ATTR_HE_6GHZ_CAPABILITY usage

In nl80211_set_station(), we check NL80211_ATTR_HE_6GHZ_CAPABILITY
and then use NL80211_ATTR_HE_CAPABILITY, which is clearly wrong.
Fix this to use NL80211_ATTR_HE_6GHZ_CAPABILITY as well.

Cc: stable@vger.kernel.org
Fixes: 43e64bf301fd ("cfg80211: handle 6 GHz capability of new station")
Link: https://lore.kernel.org/r/20200805153516.310cef625955.I0abc04dc8abb2c7c005c88ef8fa2d0e3c9fb95c4@changeid


Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Change-Id: Ic58ceb7a77933931c74b40ce9c272cc03d9cdacf
CRs-Fixed: 2763406
Git-commit: fce2ff728f95b8894db14f51c9274dc56c37616f
Git-repo: https://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git


Signed-off-by: Vinita S. Maloo <vmaloo@codeaurora.org>
Signed-off-by: Madhvapathi Sriram <msriram@codeaurora.org>

parent 8895f3dc

net/wireless/nl80211.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -5470,7 +5470,7 @@ static int nl80211_set_station(struct sk_buff skb, struct genl_info info)

		if (info->attrs[NL80211_ATTR_HE_6GHZ_CAPABILITY])
		params.he_6ghz_capa =
		nla_data(info->attrs[NL80211_ATTR_HE_CAPABILITY]);
		nla_data(info->attrs[NL80211_ATTR_HE_6GHZ_CAPABILITY]);

		/* Include parameters for TDLS peer (will check later) */
		err = nl80211_set_station_tdls(info, &params);