net: wireless: bcm4329: Allocate skb with GFP_KERNEL flag if possible
authorDmitry Shmidt <dimitrysh@google.com>
Thu, 10 Mar 2011 18:18:39 +0000 (10:18 -0800)
committerColin Cross <ccross@android.com>
Tue, 14 Jun 2011 16:09:56 +0000 (09:09 -0700)
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
drivers/net/wireless/bcm4329/linux_osl.c

index 980416baf918c75482136812fcbe0b254959274a..cf72a077bd9089a249a5332cbd05af2f969fe6aa 100644 (file)
@@ -247,8 +247,10 @@ void*
 osl_pktget(osl_t *osh, uint len)
 {
        struct sk_buff *skb;
+       gfp_t flags;
 
-       if ((skb = dev_alloc_skb(len))) {
+       flags = (in_atomic()) ? GFP_ATOMIC : GFP_KERNEL;
+       if ((skb = __dev_alloc_skb(len, flags))) {
                skb_put(skb, len);
                skb->priority = 0;