summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2012-08-09 09:57:57 +0300
committerJohn W. Linville <linville@tuxdriver.com>2012-08-10 15:27:05 -0400
commit126f492355be8c771338b680b3dfbb38a19c88ab (patch)
tree151294a5d684ea2395119f25b0ded064497dd848 /drivers/net/wireless
parent9c7ff737b6a783a6641dca71fab4f94aaab4bb2a (diff)
mwifiex: use GFP_ATOMIC under spin lock
We're holding the sta_list_spinlock here so we can't sleep. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Acked-by: Bing Zhao <bzhao@marvell.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/mwifiex/uap_event.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/mwifiex/uap_event.c b/drivers/net/wireless/mwifiex/uap_event.c
index 1703abf73da..a33fa394e34 100644
--- a/drivers/net/wireless/mwifiex/uap_event.c
+++ b/drivers/net/wireless/mwifiex/uap_event.c
@@ -63,7 +63,7 @@ mwifiex_add_sta_entry(struct mwifiex_private *priv, u8 *mac)
if (node)
goto done;
- node = kzalloc(sizeof(struct mwifiex_sta_node), GFP_KERNEL);
+ node = kzalloc(sizeof(struct mwifiex_sta_node), GFP_ATOMIC);
if (!node)
goto done;