ath5k: fix skb leaks (should fix #12199)

Backport of r34603

SVN-Revision: 34604

diff --git a/package/mac80211/patches/300-pending_work.patch b/package/mac80211/patches/300-pending_work.patch
index 9a39b325e6ffc1853814be2cc2b5dab32438b8c4..6b8508f59914b608e9ee6bbe6aa3e16795a7c7c4 100644 (file)
--- 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;
+       }
+