diff options
| author |   John W. Linville <linville@tuxdriver.com> | 2012-10-23 11:41:46 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-10-23 11:41:46 -0400 |
| commit | 9b34f40c20111ba658f88e1669598db494be1fbc (patch) | |
| tree | be98189b178ca63a44c09c8a5e92574a92932b51 /net/mac80211/util.c | |
| parent | brcm80211: remove some truely barftastic code (diff) | |
| parent | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211 (diff) | |
| download | linux-dev-9b34f40c20111ba658f88e1669598db494be1fbc.tar.xz linux-dev-9b34f40c20111ba658f88e1669598db494be1fbc.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
net/mac80211/mlme.c
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 51a4a2516233..60c8ad10deb1 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; } |