]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
wifi: mac80211: reset FILS discovery and unsol probe resp intervals
authorAloka Dixit <aloka.dixit@oss.qualcomm.com>
Wed, 24 Sep 2025 13:00:14 +0000 (18:30 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 13 Nov 2025 20:36:39 +0000 (15:36 -0500)
[ Upstream commit 607844761454e3c17e928002e126ccf21c83f6aa ]

When ieee80211_stop_ap() deletes the FILS discovery and unsolicited
broadcast probe response templates, the associated interval values
are not reset. This can lead to drivers subsequently operating with
the non-zero values, leading to unexpected behavior.

Trigger repeated retrieval attempts of the FILS discovery template in
ath12k, resulting in excessive log messages such as:

mac vdev 0 failed to retrieve FILS discovery template
mac vdev 4 failed to retrieve FILS discovery template

Fix this by resetting the intervals in ieee80211_stop_ap() to ensure
proper cleanup of FILS discovery and unsolicited broadcast probe
response templates.

Fixes: 295b02c4be74 ("mac80211: Add FILS discovery support")
Fixes: 632189a0180f ("mac80211: Unsolicited broadcast probe response support")
Signed-off-by: Aloka Dixit <aloka.dixit@oss.qualcomm.com>
Signed-off-by: Aaradhana Sahu <aaradhana.sahu@oss.qualcomm.com>
Link: https://patch.msgid.link/20250924130014.2575533-1-aaradhana.sahu@oss.qualcomm.com
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
net/mac80211/cfg.c

index 7609c7c31df7407e01c73d6a01f20f45afc37b04..e5e82e0b48ff1b76142202a51c613523eec63ff2 100644 (file)
@@ -1772,6 +1772,9 @@ static int ieee80211_stop_ap(struct wiphy *wiphy, struct net_device *dev,
        link_conf->nontransmitted = false;
        link_conf->ema_ap = false;
        link_conf->bssid_indicator = 0;
+       link_conf->fils_discovery.min_interval = 0;
+       link_conf->fils_discovery.max_interval = 0;
+       link_conf->unsol_bcast_probe_resp_interval = 0;
 
        __sta_info_flush(sdata, true, link_id, NULL);