aboutsummaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2012-12-10 15:42:34 +0000
committerFelix Fietkau <nbd@openwrt.org>2012-12-10 15:42:34 +0000
commit19fc5063331eb2090ba213ffe9fb4f8ae3149059 (patch)
tree9cc2913ffbff2f7015179b6873ef31a33db131c3 /package/mac80211/patches
parent374a72411a75356ad209eb52164c1d7c3112822a (diff)
downloadupstream-19fc5063331eb2090ba213ffe9fb4f8ae3149059.tar.gz
upstream-19fc5063331eb2090ba213ffe9fb4f8ae3149059.tar.bz2
upstream-19fc5063331eb2090ba213ffe9fb4f8ae3149059.zip
ath5k: fix skb leaks (should fix #12199)
SVN-Revision: 34603
Diffstat (limited to 'package/mac80211/patches')
-rw-r--r--package/mac80211/patches/300-pending_work.patch31
1 files changed, 31 insertions, 0 deletions
diff --git a/package/mac80211/patches/300-pending_work.patch b/package/mac80211/patches/300-pending_work.patch
index 753bf0bbb8..adce646894 100644
--- a/package/mac80211/patches/300-pending_work.patch
+++ b/package/mac80211/patches/300-pending_work.patch
@@ -583,3 +583,34 @@
#define NUM_NF_READINGS 6
#define ATH9K_NF_CAL_HIST_MAX 5
+--- a/drivers/net/wireless/ath/ath5k/base.c
++++ b/drivers/net/wireless/ath/ath5k/base.c
+@@ -851,7 +851,7 @@ ath5k_txbuf_free_skb(struct ath5k_hw *ah
+ return;
+ dma_unmap_single(ah->dev, bf->skbaddr, bf->skb->len,
+ DMA_TO_DEVICE);
+- dev_kfree_skb_any(bf->skb);
++ ieee80211_free_txskb(ah->hw, bf->skb);
+ bf->skb = NULL;
+ bf->skbaddr = 0;
+ bf->desc->ds_data = 0;
+@@ -1578,7 +1578,7 @@ ath5k_tx_queue(struct ieee80211_hw *hw,
+ return;
+
+ drop_packet:
+- dev_kfree_skb_any(skb);
++ ieee80211_free_txskb(hw, skb);
+ }
+
+ static void
+--- a/drivers/net/wireless/ath/ath5k/mac80211-ops.c
++++ b/drivers/net/wireless/ath/ath5k/mac80211-ops.c
+@@ -65,7 +65,7 @@ ath5k_tx(struct ieee80211_hw *hw, struct
+ u16 qnum = skb_get_queue_mapping(skb);
+
+ if (WARN_ON(qnum >= ah->ah_capabilities.cap_queues.q_tx_num)) {
+- dev_kfree_skb_any(skb);
++ ieee80211_free_txskb(hw, skb);
+ return;
+ }
+