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 kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
net
/
irda
/
ircomm
/
ircomm_lmp.c
diff --git
a/net/irda/ircomm/ircomm_lmp.c
b/net/irda/ircomm/ircomm_lmp.c
index
d909720
..
c8e0d89
100644
(file)
--- a/
net/irda/ircomm/ircomm_lmp.c
+++ b/
net/irda/ircomm/ircomm_lmp.c
@@
-81,7
+81,7
@@
static int ircomm_lmp_connect_response(struct ircomm_cb *self,
/* Any userdata supplied? */
if (userdata == NULL) {
/* Any userdata supplied? */
if (userdata == NULL) {
- tx_skb =
dev_alloc_skb(64
);
+ tx_skb =
alloc_skb(LMP_MAX_HEADER, GFP_ATOMIC
);
if (!tx_skb)
return -ENOMEM;
if (!tx_skb)
return -ENOMEM;
@@
-115,7
+115,7
@@
static int ircomm_lmp_disconnect_request(struct ircomm_cb *self,
IRDA_DEBUG(0, "%s()\n", __FUNCTION__ );
if (!userdata) {
IRDA_DEBUG(0, "%s()\n", __FUNCTION__ );
if (!userdata) {
- tx_skb =
dev_alloc_skb(64
);
+ tx_skb =
alloc_skb(LMP_MAX_HEADER, GFP_ATOMIC
);
if (!tx_skb)
return -ENOMEM;
if (!tx_skb)
return -ENOMEM;