diff options
| author | Felix Fietkau <nbd@nbd.name> | 2016-08-02 12:13:41 +0300 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2016-08-05 15:06:28 +0300 |
| commit | 6b07d9ca9b5363dda959b9582a3fc9c0b89ef3b5 (patch) | |
| tree | 49663349758bf02af0075037c8d4ea260a59d42d /net/mac80211/cfg.c | |
| parent | c37a54ac37e7fbf8abe2b7b886ac5f1b3e8f8d29 (diff) | |
| download | linux-6b07d9ca9b5363dda959b9582a3fc9c0b89ef3b5.tar.xz | |
mac80211: fix purging multicast PS buffer queue
The code currently assumes that buffered multicast PS frames don't have
a pending ACK frame for tx status reporting.
However, hostapd sends a broadcast deauth frame on teardown for which tx
status is requested. This can lead to the "Have pending ack frames"
warning on module reload.
Fix this by using ieee80211_free_txskb/ieee80211_purge_tx_queue.
Cc: stable@vger.kernel.org
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/cfg.c')
| -rw-r--r-- | net/mac80211/cfg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 47e99ab8d97a..543b1d4fc33d 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -869,7 +869,7 @@ static int ieee80211_stop_ap(struct wiphy *wiphy, struct net_device *dev) /* free all potentially still buffered bcast frames */ local->total_ps_buffered -= skb_queue_len(&sdata->u.ap.ps.bc_buf); - skb_queue_purge(&sdata->u.ap.ps.bc_buf); + ieee80211_purge_tx_queue(&local->hw, &sdata->u.ap.ps.bc_buf); mutex_lock(&local->mtx); ieee80211_vif_copy_chanctx_to_vlans(sdata, true); |