diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-12-10 15:44:34 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-12-10 15:44:34 +0000 |
| commit | f6e9d5010981bb4dc0e0065df2d4fabee751c127 (patch) | |
| tree | b94e11153872df0235c30605b7eb87065d6e04c1 | |
| parent | 4d347328757ee402cd6742d6827cea5db5b97e74 (diff) | |
| download | openwrt-f6e9d5010981bb4dc0e0065df2d4fabee751c127.tar.gz openwrt-f6e9d5010981bb4dc0e0065df2d4fabee751c127.zip | |
ath5k: fix skb leaks (should fix #12199)
Backport of r34603
git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@34604 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/mac80211/patches/300-pending_work.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/package/mac80211/patches/300-pending_work.patch b/package/mac80211/patches/300-pending_work.patch index 9a39b325e..6b8508f59 100644 --- a/package/mac80211/patches/300-pending_work.patch +++ b/package/mac80211/patches/300-pending_work.patch @@ -9,6 +9,24 @@ count++; } +@@ -850,7 +852,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; +@@ -1577,7 +1579,7 @@ ath5k_tx_queue(struct ieee80211_hw *hw, + return; + + drop_packet: +- dev_kfree_skb_any(skb); ++ ieee80211_free_txskb(hw, skb); + } + + static void --- a/net/mac80211/agg-rx.c +++ b/net/mac80211/agg-rx.c @@ -203,6 +203,8 @@ static void ieee80211_send_addba_resp(st @@ -993,3 +1011,14 @@ continue; } +--- 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; + } + |