From 03b781c41a5744cc5158ec2301458e34c59822fd Mon Sep 17 00:00:00 2001
From: Christian Lamparter <chunkeey@googlemail.com>
Date: Sat, 19 Nov 2011 19:30:20 +0100
Subject: [PATCH] --- yaml --- r: 278247 b: refs/heads/master c:
 fd67a728a97c171e54319833adaf8d2641954781 h: refs/heads/master i:   278245:
 02d629851235c399eda8d3a87429c4cf09e5c454   278243:
 d2fe94cfb58913cd76d59744f5179944bae606dc   278239:
 1104e4fdd71cd240f55e711f44071f4419835ae8 v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/net/wireless/ath/carl9170/tx.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 24dccb1b38b4..6d892873390b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c3745b40601513a6a6e901c3ec44ddefd0c428d8
+refs/heads/master: fd67a728a97c171e54319833adaf8d2641954781
diff --git a/trunk/drivers/net/wireless/ath/carl9170/tx.c b/trunk/drivers/net/wireless/ath/carl9170/tx.c
index 59472e1605cd..d19a9ee9d057 100644
--- a/trunk/drivers/net/wireless/ath/carl9170/tx.c
+++ b/trunk/drivers/net/wireless/ath/carl9170/tx.c
@@ -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)