aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/event.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/event.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/event.c')
-rw-r--r--net/mac80211/event.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/mac80211/event.c b/net/mac80211/event.c
index 3ac636285fb1..01ae759518f6 100644
--- a/net/mac80211/event.c
+++ b/net/mac80211/event.c
@@ -16,11 +16,12 @@
16 * driver or is still in the frame), it should provide that information. 16 * driver or is still in the frame), it should provide that information.
17 */ 17 */
18void mac80211_ev_michael_mic_failure(struct ieee80211_sub_if_data *sdata, int keyidx, 18void mac80211_ev_michael_mic_failure(struct ieee80211_sub_if_data *sdata, int keyidx,
19 struct ieee80211_hdr *hdr, const u8 *tsc) 19 struct ieee80211_hdr *hdr, const u8 *tsc,
20 gfp_t gfp)
20{ 21{
21 cfg80211_michael_mic_failure(sdata->dev, hdr->addr2, 22 cfg80211_michael_mic_failure(sdata->dev, hdr->addr2,
22 (hdr->addr1[0] & 0x01) ? 23 (hdr->addr1[0] & 0x01) ?
23 NL80211_KEYTYPE_GROUP : 24 NL80211_KEYTYPE_GROUP :
24 NL80211_KEYTYPE_PAIRWISE, 25 NL80211_KEYTYPE_PAIRWISE,
25 keyidx, tsc); 26 keyidx, tsc, gfp);
26} 27}