diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-12-10 15:42:34 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-12-10 15:42:34 +0000 |
| commit | aa0f3bb42ac853b5de05ca3011425d88f118d6a3 (patch) | |
| tree | 0d5b155e8367ef1f41ae5669f274f18863b8311c /package/mac80211/patches/300-pending_work.patch | |
| parent | b25a7d92445043ebe1422c22fec460253d3228ff (diff) | |
ath5k: fix skb leaks (should fix #12199)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34603 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/300-pending_work.patch')
| -rw-r--r-- | package/mac80211/patches/300-pending_work.patch | 31 |
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 753bf0bbb..adce64689 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; + } + |