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/iface.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/iface.c')
| -rw-r--r-- | net/mac80211/iface.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index 6f8a73c64fb3..7de7717ad67d 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c @@ -853,7 +853,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, 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); } } } |