From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Johannes Berg <johannes.berg@intel.com>,
Luca Coelho <luciano.coelho@intel.com>,
Sasha Levin <sashal@kernel.org>,
linux-wireless@vger.kernel.org, netdev@vger.kernel.org
Subject: [PATCH AUTOSEL 5.10 30/35] mac80211: reset profile_periodicity/ema_ap
Date: Mon, 21 Jun 2021 13:52:55 -0400 [thread overview]
Message-ID: <20210621175300.735437-30-sashal@kernel.org> (raw)
In-Reply-To: <20210621175300.735437-1-sashal@kernel.org>
From: Johannes Berg <johannes.berg@intel.com>
[ Upstream commit bbc6f03ff26e7b71d6135a7b78ce40e7dee3d86a ]
Apparently we never clear these values, so they'll remain set
since the setting of them is conditional. Clear the values in
the relevant other cases.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20210618133832.316e32d136a9.I2a12e51814258e1e1b526103894f4b9f19a91c8d@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
net/mac80211/mlme.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 6d3220c66931..fbe26e912300 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -4019,10 +4019,14 @@ static void ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata,
if (elems.mbssid_config_ie)
bss_conf->profile_periodicity =
elems.mbssid_config_ie->profile_periodicity;
+ else
+ bss_conf->profile_periodicity = 0;
if (elems.ext_capab_len >= 11 &&
(elems.ext_capab[10] & WLAN_EXT_CAPA11_EMA_SUPPORT))
bss_conf->ema_ap = true;
+ else
+ bss_conf->ema_ap = false;
/* continue assoc process */
ifmgd->assoc_data->timeout = jiffies;
@@ -5749,12 +5753,16 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata,
beacon_ies->data, beacon_ies->len);
if (elem && elem->datalen >= 3)
sdata->vif.bss_conf.profile_periodicity = elem->data[2];
+ else
+ sdata->vif.bss_conf.profile_periodicity = 0;
elem = cfg80211_find_elem(WLAN_EID_EXT_CAPABILITY,
beacon_ies->data, beacon_ies->len);
if (elem && elem->datalen >= 11 &&
(elem->data[10] & WLAN_EXT_CAPA11_EMA_SUPPORT))
sdata->vif.bss_conf.ema_ap = true;
+ else
+ sdata->vif.bss_conf.ema_ap = false;
} else {
assoc_data->timeout = jiffies;
assoc_data->timeout_started = true;
--
2.30.2
next prev parent reply other threads:[~2021-06-21 17:58 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20210621175300.735437-1-sashal@kernel.org>
2021-06-21 17:52 ` [PATCH AUTOSEL 5.10 05/35] mac80211: remove warning in ieee80211_get_sband() Sasha Levin
2021-06-21 17:52 ` [PATCH AUTOSEL 5.10 06/35] mac80211_hwsim: drop pending frames on stop Sasha Levin
2021-06-21 17:52 ` [PATCH AUTOSEL 5.10 07/35] cfg80211: call cfg80211_leave_ocb when switching away from OCB Sasha Levin
2021-06-21 17:52 ` [PATCH AUTOSEL 5.10 12/35] net: ipv4: Remove unneed BUG() function Sasha Levin
2021-06-21 17:52 ` [PATCH AUTOSEL 5.10 13/35] mac80211: drop multicast fragments Sasha Levin
2021-06-21 17:52 ` [PATCH AUTOSEL 5.10 14/35] net: ethtool: clear heap allocations for ethtool function Sasha Levin
2021-06-21 17:52 ` [PATCH AUTOSEL 5.10 15/35] inet: annotate data race in inet_send_prepare() and inet_dgram_connect() Sasha Levin
2021-06-21 17:52 ` [PATCH AUTOSEL 5.10 16/35] ping: Check return value of function 'ping_queue_rcv_skb' Sasha Levin
2021-06-21 17:52 ` [PATCH AUTOSEL 5.10 17/35] net: annotate data race in sock_error() Sasha Levin
2021-06-21 17:52 ` [PATCH AUTOSEL 5.10 18/35] inet: annotate date races around sk->sk_txhash Sasha Levin
2021-06-21 17:52 ` [PATCH AUTOSEL 5.10 19/35] net/packet: annotate data race in packet_sendmsg() Sasha Levin
2021-06-21 17:52 ` [PATCH AUTOSEL 5.10 20/35] net: phy: dp83867: perform soft reset and retain established link Sasha Levin
2021-06-21 17:52 ` [PATCH AUTOSEL 5.10 22/35] net: caif: fix memory leak in ldisc_open Sasha Levin
2021-06-21 17:52 ` [PATCH AUTOSEL 5.10 23/35] net/packet: annotate accesses to po->bind Sasha Levin
2021-06-21 17:52 ` [PATCH AUTOSEL 5.10 24/35] net/packet: annotate accesses to po->ifindex Sasha Levin
2021-06-21 17:52 ` [PATCH AUTOSEL 5.10 25/35] r8152: Avoid memcpy() over-reading of ETH_SS_STATS Sasha Levin
2021-06-21 17:52 ` [PATCH AUTOSEL 5.10 26/35] sh_eth: " Sasha Levin
2021-06-21 17:52 ` [PATCH AUTOSEL 5.10 27/35] r8169: " Sasha Levin
2021-06-21 17:52 ` [PATCH AUTOSEL 5.10 29/35] net: qed: Fix memcpy() overflow of qed_dcbx_params() Sasha Levin
2021-06-21 17:52 ` Sasha Levin [this message]
2021-06-21 17:52 ` [PATCH AUTOSEL 5.10 31/35] mac80211: handle various extensible elements correctly Sasha Levin
2021-06-21 17:52 ` [PATCH AUTOSEL 5.10 34/35] net: ll_temac: Add memory-barriers for TX BD access Sasha Levin
2021-06-21 17:53 ` [PATCH AUTOSEL 5.10 35/35] net: ll_temac: Avoid ndo_start_xmit returning NETDEV_TX_BUSY Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210621175300.735437-30-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=johannes.berg@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=luciano.coelho@intel.com \
--cc=netdev@vger.kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).