diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-10-19 21:55:42 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-10-19 21:55:42 +0400 |
| commit | 06f40a41b80e25e88a2b612ea3b2a94f93c94f72 (patch) | |
| tree | fa3bc4d691d7024425183bfc1be75a36c4e1d3f3 /net/mac80211/sta_info.c | |
| parent | db0fe0b2f6bba2fda939737d063db2ae14c58d71 (diff) | |
| parent | 290eddc4b3661dc4dfa95d199e0be5788928b3b1 (diff) | |
| download | linux-06f40a41b80e25e88a2b612ea3b2a94f93c94f72.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
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); } /* |