aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/rx.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2009-07-01 15:26:47 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-07-10 15:01:49 -0400
commite6d6e3420d511cd7552a95d1f04bd4c80a9ddb34 (patch)
tree35f34c9ef8fe4c201da36ca819045995a93eeb44 /net/mac80211/rx.c
parentdad823302135a2d99efd40e35d94a6ff14961c93 (diff)
cfg80211: use proper allocation flags
Instead of hardcoding GFP_ATOMIC everywhere, add a new function parameter that gets the flags from the caller. Obviously then I need to update all callers (all of them in mac80211), and it turns out that now it's ok to use GFP_KERNEL in almost all places. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/rx.c')
-rw-r--r--net/mac80211/rx.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 0563b6969a21..ec5acc6dc021 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -1863,7 +1863,8 @@ static void ieee80211_rx_michael_mic_report(struct net_device *dev,
1863 !ieee80211_is_auth(hdr->frame_control)) 1863 !ieee80211_is_auth(hdr->frame_control))
1864 goto ignore; 1864 goto ignore;
1865 1865
1866 mac80211_ev_michael_mic_failure(rx->sdata, keyidx, hdr, NULL); 1866 mac80211_ev_michael_mic_failure(rx->sdata, keyidx, hdr, NULL,
1867 GFP_ATOMIC);
1867 ignore: 1868 ignore:
1868 dev_kfree_skb(rx->skb); 1869 dev_kfree_skb(rx->skb);
1869 rx->skb = NULL; 1870 rx->skb = NULL;