mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-24 15:56:49 +00:00
mac80211: use ieee80211_free_txskb in a few more places
SVN-Revision: 33695
This commit is contained in:
parent
d1d1ae994b
commit
cc59e71f84
@ -105,3 +105,54 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void ieee80211_check_pending_bar(struct sta_info *sta, u8 *addr, u8 tid)
|
static void ieee80211_check_pending_bar(struct sta_info *sta, u8 *addr, u8 tid)
|
||||||
|
--- a/net/mac80211/iface.c
|
||||||
|
+++ b/net/mac80211/iface.c
|
||||||
|
@@ -826,7 +826,7 @@ static void ieee80211_do_stop(struct iee
|
||||||
|
struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
|
||||||
|
if (info->control.vif == &sdata->vif) {
|
||||||
|
__skb_unlink(skb, &local->pending[i]);
|
||||||
|
- dev_kfree_skb_irq(skb);
|
||||||
|
+ ieee80211_free_txskb(&local->hw, skb);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
--- a/net/mac80211/sta_info.c
|
||||||
|
+++ b/net/mac80211/sta_info.c
|
||||||
|
@@ -587,7 +587,7 @@ static bool sta_info_cleanup_expire_buff
|
||||||
|
*/
|
||||||
|
if (!skb)
|
||||||
|
break;
|
||||||
|
- dev_kfree_skb(skb);
|
||||||
|
+ ieee80211_free_txskb(&local->hw, skb);
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
@@ -616,7 +616,7 @@ static bool sta_info_cleanup_expire_buff
|
||||||
|
local->total_ps_buffered--;
|
||||||
|
ps_dbg(sta->sdata, "Buffered frame expired (STA %pM)\n",
|
||||||
|
sta->sta.addr);
|
||||||
|
- dev_kfree_skb(skb);
|
||||||
|
+ ieee80211_free_txskb(&local->hw, skb);
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
--- a/net/mac80211/util.c
|
||||||
|
+++ b/net/mac80211/util.c
|
||||||
|
@@ -406,7 +406,7 @@ void ieee80211_add_pending_skb(struct ie
|
||||||
|
int queue = info->hw_queue;
|
||||||
|
|
||||||
|
if (WARN_ON(!info->control.vif)) {
|
||||||
|
- kfree_skb(skb);
|
||||||
|
+ ieee80211_free_txskb(&local->hw, skb);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -431,7 +431,7 @@ void ieee80211_add_pending_skbs_fn(struc
|
||||||
|
struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
|
||||||
|
|
||||||
|
if (WARN_ON(!info->control.vif)) {
|
||||||
|
- kfree_skb(skb);
|
||||||
|
+ ieee80211_free_txskb(&local->hw, skb);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user