]> Pileus Git - ~andy/linux/commitdiff
carl9170: use ieee80211_free_txskb
authorChristian Lamparter <chunkeey@googlemail.com>
Sat, 19 Nov 2011 18:30:20 +0000 (19:30 +0100)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 21 Nov 2011 21:22:10 +0000 (16:22 -0500)
In the past, it was fine to simply call
dev_kfree_skb when it was impossible to
transmit a skb. However, with the new
tx status API:
"mac80211: implement wifi TX status"
Every loose skb needs to be handed back
to mac80211.

Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/ath/carl9170/tx.c

index 59472e1605cd89779e06c299937ba950968b3daf..d19a9ee9d057a904577d9497435911bc2867e978 100644 (file)
@@ -314,7 +314,7 @@ static void carl9170_tx_release(struct kref *ref)
                         *    feedback either [CTL_REQ_TX_STATUS not set]
                         */
 
-                       dev_kfree_skb_any(skb);
+                       ieee80211_free_txskb(ar->hw, skb);
                        return;
                } else {
                        /*
@@ -1432,7 +1432,7 @@ void carl9170_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
 
 err_free:
        ar->tx_dropped++;
-       dev_kfree_skb_any(skb);
+       ieee80211_free_txskb(ar->hw, skb);
 }
 
 void carl9170_tx_scheduler(struct ar9170 *ar)