diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2011-03-10 10:18:39 -0800 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2011-03-10 10:18:39 -0800 |
| commit | 5c58e03b81e1ac1231f1ae68e4611c31f428f2f9 (patch) | |
| tree | 6b05dae6eaf5bc19dc5aaaf85b1dec33ea7d6888 /drivers/net | |
| parent | 25a87f387fe0421153a528b7dc70b96bea4842cd (diff) | |
net: wireless: bcm4329: Allocate skb with GFP_KERNEL flag if possible
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/bcm4329/linux_osl.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/bcm4329/linux_osl.c b/drivers/net/wireless/bcm4329/linux_osl.c index d00bd1ca291b..3a026eed516e 100644 --- a/drivers/net/wireless/bcm4329/linux_osl.c +++ b/drivers/net/wireless/bcm4329/linux_osl.c @@ -246,8 +246,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; |