FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-27 03:47:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mac80211: use ieee80211_free_txskb in a few more places

Browse Source 
Free tx status skbs when draining power save buffers, pending frames, or
when tearing down a vif.
Fixes remaining conditions that can lead to hostapd/wpa_supplicant hangs when
running out of socket write memory.

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Cc: stable@vger.kernel.org
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Felix Fietkau 2012-10-10 22:40:23 +02:00 committed by John W. Linville
parent 3e4f319dac
commit d4fa14cd62
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/mac80211/iface.c
View File

@ -853,7 +853,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
if (info->control.vif == &sdata->vif) { if (info->control.vif == &sdata->vif) {
__skb_unlink(skb, &local->pending[i]); __skb_unlink(skb, &local->pending[i]);
dev_kfree_skb_irq(skb); ieee80211_free_txskb(&local->hw, skb);
} }
} }
} }

4
net/mac80211/sta_info.c
View File

@ -650,7 +650,7 @@ static bool sta_info_cleanup_expire_buffered_ac(struct ieee80211_local *local,
*/ */
if (!skb) if (!skb)
break; break;
dev_kfree_skb(skb); ieee80211_free_txskb(&local->hw, skb);
} }
/* /*
@ -679,7 +679,7 @@ static bool sta_info_cleanup_expire_buffered_ac(struct ieee80211_local *local,
local->total_ps_buffered--; local->total_ps_buffered--;
ps_dbg(sta->sdata, "Buffered frame expired (STA %pM)\n", ps_dbg(sta->sdata, "Buffered frame expired (STA %pM)\n",
sta->sta.addr); sta->sta.addr);
dev_kfree_skb(skb); ieee80211_free_txskb(&local->hw, skb);
} }
/* /*

4
net/mac80211/util.c
View File

@ -406,7 +406,7 @@ void ieee80211_add_pending_skb(struct ieee80211_local *local,
int queue = info->hw_queue; int queue = info->hw_queue;
if (WARN_ON(!info->control.vif)) { if (WARN_ON(!info->control.vif)) {
kfree_skb(skb); ieee80211_free_txskb(&local->hw, skb);
return; return;
} }
@ -431,7 +431,7 @@ void ieee80211_add_pending_skbs_fn(struct ieee80211_local *local,
struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
if (WARN_ON(!info->control.vif)) { if (WARN_ON(!info->control.vif)) {
kfree_skb(skb); ieee80211_free_txskb(&local->hw, skb);
continue; continue;
} }