]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
wifi: mac80211: Cleanup sta TXQs on flush
authorAlexander Wetzel <Alexander@wetzel-home.de>
Tue, 4 Feb 2025 12:31:29 +0000 (13:31 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 10 Apr 2025 12:39:28 +0000 (14:39 +0200)
[ Upstream commit 5b999006e35ea9c11116ddff7e375b256421d0af ]

Drop the sta TXQs on flush when the drivers is not supporting
flush.

ieee80211_set_disassoc() tries to clean up everything for the sta.
But it ignored queued frames in the sta TX queues when the driver
isn't supporting the flush driver ops.

Signed-off-by: Alexander Wetzel <Alexander@wetzel-home.de>
Link: https://patch.msgid.link/20250204123129.9162-1-Alexander@wetzel-home.de
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
net/mac80211/util.c

index 2b6e8e7307ee5e9d3ef35998cd66a445d359ba00..a98ae563613c046523d64a93718970625040f0d9 100644 (file)
@@ -685,7 +685,7 @@ void __ieee80211_flush_queues(struct ieee80211_local *local,
                              struct ieee80211_sub_if_data *sdata,
                              unsigned int queues, bool drop)
 {
-       if (!local->ops->flush)
+       if (!local->ops->flush && !drop)
                return;
 
        /*
@@ -712,7 +712,8 @@ void __ieee80211_flush_queues(struct ieee80211_local *local,
                }
        }
 
-       drv_flush(local, sdata, queues, drop);
+       if (local->ops->flush)
+               drv_flush(local, sdata, queues, drop);
 
        ieee80211_wake_queues_by_reason(&local->hw, queues,
                                        IEEE80211_QUEUE_STOP_REASON_FLUSH,