summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/bcm4329
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2011-10-09 02:24:14 +0100
committerAndy Green <andy.green@linaro.org>2011-10-09 02:24:14 +0100
commit56e1e055c451e404b465a1ef11a29afb8bf457b7 (patch)
tree21402c1fbb5276b0eb280c6b83baa23e2c3f97ec /drivers/net/wireless/bcm4329
parentde625ceb2ef7697b77026ddf9810cdbd270ee1b6 (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/wireless/bcm4329')
-rw-r--r--drivers/net/wireless/bcm4329/linux_osl.c4
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 980416baf91..cf72a077bd9 100644
--- a/drivers/net/wireless/bcm4329/linux_osl.c
+++ b/drivers/net/wireless/bcm4329/linux_osl.c
@@ -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;