aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Lamparter <chunkeey@googlemail.com>2011-11-19 13:30:20 -0500
committerJohn W. Linville <linville@tuxdriver.com>2011-11-21 16:22:10 -0500
commitfd67a728a97c171e54319833adaf8d2641954781 (patch)
tree74206536140d58df6e037c3236a5164384938336
parentc3745b40601513a6a6e901c3ec44ddefd0c428d8 (diff)
carl9170: use ieee80211_free_txskb
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>
-rw-r--r--drivers/net/wireless/ath/carl9170/tx.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/carl9170/tx.c b/drivers/net/wireless/ath/carl9170/tx.c
index 59472e1605cd..d19a9ee9d057 100644
--- a/drivers/net/wireless/ath/carl9170/tx.c
+++ b/drivers/net/wireless/ath/carl9170/tx.c
@@ -314,7 +314,7 @@ static void carl9170_tx_release(struct kref *ref)
314 * feedback either [CTL_REQ_TX_STATUS not set] 314 * feedback either [CTL_REQ_TX_STATUS not set]
315 */ 315 */
316 316
317 dev_kfree_skb_any(skb); 317 ieee80211_free_txskb(ar->hw, skb);
318 return; 318 return;
319 } else { 319 } else {
320 /* 320 /*
@@ -1432,7 +1432,7 @@ void carl9170_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
1432 1432
1433err_free: 1433err_free:
1434 ar->tx_dropped++; 1434 ar->tx_dropped++;
1435 dev_kfree_skb_any(skb); 1435 ieee80211_free_txskb(ar->hw, skb);
1436} 1436}
1437 1437
1438void carl9170_tx_scheduler(struct ar9170 *ar) 1438void carl9170_tx_scheduler(struct ar9170 *ar)