From: Johannes Berg <johannes.berg@intel.com>
Date: Sun, 14 Jul 2013 20:37:14 +0000 (+0300)
Subject: mac80211_hwsim: use ieee80211_free_txskb
X-Git-Tag: MMI-PSA29.97-13-9~13727^2~84^2^2~6^2~30
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=fe0f3cd2a6a1f16fcaffec3e69e918bcf40ec76d;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

mac80211_hwsim: use ieee80211_free_txskb

These are only strange error cases, so it's not really
all that important, but the driver really should use
ieee80211_free_txskb() instead of just dev_kfree_skb().

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---

diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
index cb34c7895f2a..11adae804564 100644
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -867,7 +867,7 @@ static void mac80211_hwsim_tx(struct ieee80211_hw *hw,
 
 	if (WARN_ON(skb->len < 10)) {
 		/* Should not happen; just a sanity check for addr1 use */
-		dev_kfree_skb(skb);
+		ieee80211_free_txskb(hw, skb);
 		return;
 	}
 
@@ -884,13 +884,13 @@ static void mac80211_hwsim_tx(struct ieee80211_hw *hw,
 	}
 
 	if (WARN(!channel, "TX w/o channel - queue = %d\n", txi->hw_queue)) {
-		dev_kfree_skb(skb);
+		ieee80211_free_txskb(hw, skb);
 		return;
 	}
 
 	if (data->idle && !data->tmp_chan) {
 		wiphy_debug(hw->wiphy, "Trying to TX when idle - reject\n");
-		dev_kfree_skb(skb);
+		ieee80211_free_txskb(hw, skb);
 		return;
 	}