]> err.no Git - linux-2.6/commitdiff
mac80211: tx, use dev_kfree_skb_any for beacon_get
authorJiri Slaby <jirislaby@gmail.com>
Mon, 14 Jul 2008 10:43:23 +0000 (12:43 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 29 Jul 2008 20:55:07 +0000 (16:55 -0400)
Use dev_kfree_skb_any(); instead of dev_kfree_skb();, since
ieee80211_beacon_get function might be called from atomic.
(It's in a fail path.)

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Cc: Johannes Berg <johannes@sipsolutions.net>
Cc: Michael Wu <flamingice@sourmilk.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
net/mac80211/tx.c

index 0fbadd8b983c821df9de353217e998058565718f..7e99d16151920503d923a273feec0892c0393aba 100644 (file)
@@ -1931,7 +1931,7 @@ struct sk_buff *ieee80211_beacon_get(struct ieee80211_hw *hw,
                               "no rate found\n",
                               wiphy_name(local->hw.wiphy));
                }
-               dev_kfree_skb(skb);
+               dev_kfree_skb_any(skb);
                skb = NULL;
                goto out;
        }