diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-10-19 13:55:42 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-10-19 13:55:42 -0400 |
| commit | 06f40a41b80e25e88a2b612ea3b2a94f93c94f72 (patch) | |
| tree | fa3bc4d691d7024425183bfc1be75a36c4e1d3f3 /net/mac80211/util.c | |
| parent | db0fe0b2f6bba2fda939737d063db2ae14c58d71 (diff) | |
| parent | 290eddc4b3661dc4dfa95d199e0be5788928b3b1 (diff) | |
| download | linux-06f40a41b80e25e88a2b612ea3b2a94f93c94f72.tar.gz linux-06f40a41b80e25e88a2b612ea3b2a94f93c94f72.tar.bz2 linux-06f40a41b80e25e88a2b612ea3b2a94f93c94f72.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'net/mac80211/util.c')
| -rw-r--r-- | net/mac80211/util.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/util.c b/net/mac80211/util.c index 22ca35054dd0..94e586873979 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@ -406,7 +406,7 @@ void ieee80211_add_pending_skb(struct ieee80211_local *local, 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(struct ieee80211_local *local, 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; } |