From 62895053df4a2cad9fb6cf68d59b11c274931f34 Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia.lawall@lip6.fr>
Date: Mon, 9 Jan 2012 10:40:50 +0100
Subject: [PATCH] --- yaml --- r: 289949 b: refs/heads/master c:
 75ac9a28a0c6b818ba1aba874b6b3ae17241552c h: refs/heads/master i:   289947:
 2bfc1a9dc27040172d566b13bd701c496d899503 v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/net/wireless/mwifiex/scan.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b634e979f3a8..c616992277b8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 11ee51589a61fa836b1540293ad6c7dfd7de544a
+refs/heads/master: 75ac9a28a0c6b818ba1aba874b6b3ae17241552c
diff --git a/trunk/drivers/net/wireless/mwifiex/scan.c b/trunk/drivers/net/wireless/mwifiex/scan.c
index 6396d3318ead..98f1ca9cd6d8 100644
--- a/trunk/drivers/net/wireless/mwifiex/scan.c
+++ b/trunk/drivers/net/wireless/mwifiex/scan.c
@@ -2001,7 +2001,7 @@ mwifiex_save_curr_bcn(struct mwifiex_private *priv)
 
 		kfree(priv->curr_bcn_buf);
 		priv->curr_bcn_buf = kmalloc(curr_bss->beacon_buf_size,
-						GFP_KERNEL);
+						GFP_ATOMIC);
 		if (!priv->curr_bcn_buf) {
 			dev_err(priv->adapter->dev,
 					"failed to alloc curr_bcn_buf\n");