diff options
author | Felix Fietkau <nbd@openwrt.org> | 2012-10-10 22:40:23 +0200 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-10-15 14:45:50 -0400 |
commit | d4fa14cd62bd078c8e3ef39283b9f237e5b2ff0f (patch) | |
tree | 420a4835d573d45f98ce488dadd899f58599b2e9 /net/mac80211/sta_info.c | |
parent | 3e4f319dacc60c1b4537b85329d393ad18bf7501 (diff) | |
download | blackbird-op-linux-d4fa14cd62bd078c8e3ef39283b9f237e5b2ff0f.tar.gz blackbird-op-linux-d4fa14cd62bd078c8e3ef39283b9f237e5b2ff0f.zip |
mac80211: use ieee80211_free_txskb in a few more places
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>
Diffstat (limited to 'net/mac80211/sta_info.c')
-rw-r--r-- | net/mac80211/sta_info.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c index 797dd36a220d..0a4e4c04db89 100644 --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c @@ -650,7 +650,7 @@ static bool sta_info_cleanup_expire_buffered_ac(struct ieee80211_local *local, */ if (!skb) 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--; ps_dbg(sta->sdata, "Buffered frame expired (STA %pM)\n", sta->sta.addr); - dev_kfree_skb(skb); + ieee80211_free_txskb(&local->hw, skb); } /* |