]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
brcm80211: fmac: change allocation flag in brcmf_enq_event() function
authorArend van Spriel <arend@broadcom.com>
Thu, 9 Feb 2012 20:09:06 +0000 (21:09 +0100)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 22 Feb 2012 19:48:52 +0000 (14:48 -0500)
As the function is called from atomic context it should not do the
kzalloc call with GFP_KERNEL.

Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: Kan Yan <kanyan@broadcom.com>
Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c

index e95a883c77daa08b91b585a5f1351a168b5dc96d..285fa19e881ddf791c73f91cf08af644eb3748e5 100644 (file)
@@ -3297,7 +3297,9 @@ static struct brcmf_cfg80211_event_q *brcmf_deq_event(
 }
 
 /*
-** push event to tail of the queue
+*      push event to tail of the queue
+*
+*      remark: this function may not sleep as it is called in atomic context.
 */
 
 static s32
@@ -3307,7 +3309,7 @@ brcmf_enq_event(struct brcmf_cfg80211_priv *cfg_priv, u32 event,
        struct brcmf_cfg80211_event_q *e;
        s32 err = 0;
 
-       e = kzalloc(sizeof(struct brcmf_cfg80211_event_q), GFP_KERNEL);
+       e = kzalloc(sizeof(struct brcmf_cfg80211_event_q), GFP_ATOMIC);
        if (!e)
                return -ENOMEM;