summaryrefslogtreecommitdiffstats
path: root/net/mac80211/mlme.c
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2020-09-27 12:56:05 +0200
committerJohannes Berg <johannes.berg@intel.com>2020-09-28 14:19:55 +0200
commite3f25908b0b2e7e1d04d35ce46c9b9d4e4519b43 (patch)
treeb79c051c8fc678fef2d4cd5bc881ad8ea134d483 /net/mac80211/mlme.c
parentmac80211_hwsim: indicate support for S1G (diff)
downloadlinux-e3f25908b0b2e7e1d04d35ce46c9b9d4e4519b43.tar.xz
linux-e3f25908b0b2e7e1d04d35ce46c9b9d4e4519b43.zip
mac80211: fix regression in sta connection monitor
When a frame was acked and probe frames were sent, the connection monitoring needs to be reset, otherwise it will keep probing until the connection is considered dead, even though frames have been acked in the mean time. Fixes: 9abf4e49830d ("mac80211: optimize station connection monitor") Reported-by: Georgi Valkov <gvalkov@abv.bg> Signed-off-by: Felix Fietkau <nbd@nbd.name> Link: https://lore.kernel.org/r/20200927105605.97954-1-nbd@nbd.name Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/mlme.c')
-rw-r--r--net/mac80211/mlme.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index e2df4d54d9df..38e87ac9902e 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -2533,7 +2533,9 @@ void ieee80211_sta_tx_notify(struct ieee80211_sub_if_data *sdata,
!sdata->u.mgd.probe_send_count)
return;
- if (!ack)
+ if (ack)
+ sdata->u.mgd.probe_send_count = 0;
+ else
sdata->u.mgd.nullfunc_failed = true;
ieee80211_queue_work(&sdata->local->hw, &sdata->work);
}