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

Commit 6d9aec4b authored by Johannes Berg's avatar Johannes Berg Committed by Greg Kroah-Hartman
Browse files

UPSTREAM: nl80211: fix NL80211_ATTR_HE_6GHZ_CAPABILITY usage 

commit fce2ff728f95b8894db14f51c9274dc56c37616f upstream.

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: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit fce2ff728f95b8894db14f51c9274dc56c37616f)
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Ib3951a485537514e26a9ac70ad9773580ecc4f53
parent 2bcdc156

net/wireless/nl80211.c

+1 −1
Original line number Diff line number Diff line
@@ -5980,7 +5980,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]);



	if (info->attrs[NL80211_ATTR_AIRTIME_WEIGHT])

		params.airtime_weight =