OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e108ab7
)
bcmdhd: Allocate skb with GFP_KERNEL flag if possible: fix for older kernels.
author
Howard M. Harte
<hharte@broadcom.com>
Thu, 16 Jun 2011 01:52:15 +0000
(18:52 -0700)
committer
Howard M. Harte
<hharte@broadcom.com>
Thu, 16 Jun 2011 01:53:19 +0000
(18:53 -0700)
Change-Id: I38cecad2af57790dab4b5583c76db1095a79e255
Signed-off-by: Howard M. Harte <hharte@broadcom.com>
drivers/net/wireless/bcmdhd/linux_osl.c
patch
|
blob
|
history
diff --git
a/drivers/net/wireless/bcmdhd/linux_osl.c
b/drivers/net/wireless/bcmdhd/linux_osl.c
index
bfbfc88
..
eda5ddf
100644
(file)
--- a/
drivers/net/wireless/bcmdhd/linux_osl.c
+++ b/
drivers/net/wireless/bcmdhd/linux_osl.c
@@
-248,9
+248,13
@@
osl_detach(osl_t *osh)
struct sk_buff *osl_alloc_skb(unsigned int len)
{
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)
gfp_t flags = (in_atomic()) ? GFP_ATOMIC : GFP_KERNEL;
return __dev_alloc_skb(len, flags);
+#else
+ return dev_alloc_skb(len);
+#endif
}
#ifdef CTFPOOL