Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31df3bb7 authored by Johannes Berg's avatar Johannes Berg
Browse files

iwlwifi: use ieee80211_free_txskb 



To let mac80211 clean up any TX information when
a frame is dropped, use ieee80211_free_txskb().

Reviewed-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 7c341582

drivers/net/wireless/iwlwifi/dvm/mac80211.c

+1 −1
Original line number Diff line number Diff line
@@ -521,7 +521,7 @@ static void iwlagn_mac_tx(struct ieee80211_hw *hw, 
		     ieee80211_get_tx_rate(hw, IEEE80211_SKB_CB(skb))->bitrate);



	if (iwlagn_tx_skb(priv, control->sta, skb))

		dev_kfree_skb_any(skb);

		ieee80211_free_txskb(hw, skb);

}



static void iwlagn_mac_update_tkip_key(struct ieee80211_hw *hw,

drivers/net/wireless/iwlwifi/dvm/main.c

+1 −1
Original line number Diff line number Diff line
@@ -2114,7 +2114,7 @@ static void iwl_free_skb(struct iwl_op_mode *op_mode, struct sk_buff *skb) 


	info = IEEE80211_SKB_CB(skb);

	iwl_trans_free_tx_cmd(priv->trans, info->driver_data[1]);

	dev_kfree_skb_any(skb);

	ieee80211_free_txskb(priv->hw, skb);

}



static void iwl_set_hw_rfkill_state(struct iwl_op_mode *op_mode, bool state)