diff options
author | Felix Fietkau <nbd@openwrt.org> | 2012-11-10 03:44:14 +0100 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2012-11-10 21:26:28 +0100 |
commit | 1f98ab7fef48a2968f37f422c256c9fbd978c3f0 (patch) | |
tree | 69f0c49312c489063d02da10ac1f39490a585334 /net/mac80211/sta_info.c | |
parent | 20f544eea03db4b498942558b882d463ce575c3e (diff) | |
download | kernel_goldelico_gta04-1f98ab7fef48a2968f37f422c256c9fbd978c3f0.zip kernel_goldelico_gta04-1f98ab7fef48a2968f37f422c256c9fbd978c3f0.tar.gz kernel_goldelico_gta04-1f98ab7fef48a2968f37f422c256c9fbd978c3f0.tar.bz2 |
mac80211: call skb_dequeue/ieee80211_free_txskb instead of __skb_queue_purge
Fixes more wifi status skb leaks, leading to hostapd/wpa_supplicant hangs.
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Cc: stable@vger.kernel.org
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/sta_info.c')
-rw-r--r-- | net/mac80211/sta_info.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c index 89ccd3e..3b5911e 100644 --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c @@ -117,8 +117,8 @@ static void free_sta_work(struct work_struct *wk) for (ac = 0; ac < IEEE80211_NUM_ACS; ac++) { local->total_ps_buffered -= skb_queue_len(&sta->ps_tx_buf[ac]); - __skb_queue_purge(&sta->ps_tx_buf[ac]); - __skb_queue_purge(&sta->tx_filtered[ac]); + ieee80211_purge_tx_queue(&local->hw, &sta->ps_tx_buf[ac]); + ieee80211_purge_tx_queue(&local->hw, &sta->tx_filtered[ac]); } #ifdef CONFIG_MAC80211_MESH @@ -141,7 +141,7 @@ static void free_sta_work(struct work_struct *wk) tid_tx = rcu_dereference_raw(sta->ampdu_mlme.tid_tx[i]); if (!tid_tx) continue; - __skb_queue_purge(&tid_tx->pending); + ieee80211_purge_tx_queue(&local->hw, &tid_tx->pending); kfree(tid_tx); } |