The following commit has been merged in the batman-adv/next branch: commit 126f492355be8c771338b680b3dfbb38a19c88ab Author: Dan Carpenter dan.carpenter@oracle.com Date: Thu Aug 9 09:57:57 2012 +0300

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

diff --git a/drivers/net/wireless/mwifiex/uap_event.c b/drivers/net/wireless/mwifiex/uap_event.c index 1703abf..a33fa39 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;