git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
net
/
irda
/
iriap_event.c
diff --git
a/net/irda/iriap_event.c
b/net/irda/iriap_event.c
index
a736074
..
da17395
100644
(file)
--- a/
net/irda/iriap_event.c
+++ b/
net/irda/iriap_event.c
@@
-365,7
+365,7
@@
static void state_r_disconnect(struct iriap_cb *self, IRIAP_EVENT event,
switch (event) {
case IAP_LM_CONNECT_INDICATION:
- tx_skb =
dev_alloc_skb(64
);
+ tx_skb =
alloc_skb(64, GFP_ATOMIC
);
if (tx_skb == NULL) {
IRDA_WARNING("%s: unable to malloc!\n", __FUNCTION__);
return;