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)
committermgross <mark.gross@intel.com>
Wed, 9 Nov 2011 20:07:24 +0000 (12:07 -0800)
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
drivers/net/wireless/bcm4329/linux_osl.c

index 980416b..cf72a07 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;