aboutsummaryrefslogtreecommitdiff
path: root/net/mac80211/status.c
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2012-11-10 03:44:14 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-26 11:37:41 -0800
commitbb1d6871282e191752d4d8396808ed25ac3500fb (patch)
tree6ff5cff5202b88b9a650f2d8f87d65396f771199 /net/mac80211/status.c
parentab4e547760de676be22d61c5d73230356b383a31 (diff)
mac80211: call skb_dequeue/ieee80211_free_txskb instead of __skb_queue_purge
commit 1f98ab7fef48a2968f37f422c256c9fbd978c3f0 upstream. Fixes more wifi status skb leaks, leading to hostapd/wpa_supplicant hangs. Signed-off-by: Felix Fietkau <nbd@openwrt.org> Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/mac80211/status.c')
-rw-r--r--net/mac80211/status.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/net/mac80211/status.c b/net/mac80211/status.c
index 5f8f89e89d6b..47b117f3f567 100644
--- a/net/mac80211/status.c
+++ b/net/mac80211/status.c
@@ -660,3 +660,12 @@ void ieee80211_free_txskb(struct ieee80211_hw *hw, struct sk_buff *skb)
dev_kfree_skb_any(skb);
}
EXPORT_SYMBOL(ieee80211_free_txskb);
+
+void ieee80211_purge_tx_queue(struct ieee80211_hw *hw,
+ struct sk_buff_head *skbs)
+{
+ struct sk_buff *skb;
+
+ while ((skb = __skb_dequeue(skbs)))
+ ieee80211_free_txskb(hw, skb);
+}