diff options
author | David S. Miller <davem@davemloft.net> | 2009-10-08 15:55:21 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-10-08 15:55:21 -0700 |
commit | 67972e0c238fa802580b5919f11e1de3da5179da (patch) | |
tree | 27022c957154a9d36fc8aa0f020bed523e7849b3 /net/mac80211/util.c | |
parent | ad61df918c44316940404891d5082c63e79c256a (diff) | |
parent | 8a8e05e5d8f6155788761961fc9845328863c16d (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
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 dd6564321369..aeb65b3d2295 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@ -339,7 +339,7 @@ void ieee80211_add_pending_skb(struct ieee80211_local *local, struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); if (WARN_ON(!info->control.vif)) { - kfree(skb); + kfree_skb(skb); return; } @@ -367,7 +367,7 @@ int ieee80211_add_pending_skbs(struct ieee80211_local *local, struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); if (WARN_ON(!info->control.vif)) { - kfree(skb); + kfree_skb(skb); continue; } |