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.2257_FC5 patched with stable patch-2.6.18.5-vs2.0...
[linux-2.6.git]
/
net
/
irda
/
irttp.c
diff --git
a/net/irda/irttp.c
b/net/irda/irttp.c
index
42acf1c
..
be0d8fa
100644
(file)
--- a/
net/irda/irttp.c
+++ b/
net/irda/irttp.c
@@
-1098,7
+1098,7
@@
int irttp_connect_request(struct tsap_cb *self, __u8 dtsap_sel,
return -ENOMEM;
/* Reserve space for MUX_CONTROL and LAP header */
return -ENOMEM;
/* Reserve space for MUX_CONTROL and LAP header */
- skb_reserve(tx_skb, TTP_MAX_HEADER);
+ skb_reserve(tx_skb, TTP_MAX_HEADER
+ TTP_SAR_HEADER
);
} else {
tx_skb = userdata;
/*
} else {
tx_skb = userdata;
/*
@@
-1346,7
+1346,7
@@
int irttp_connect_response(struct tsap_cb *self, __u32 max_sdu_size,
return -ENOMEM;
/* Reserve space for MUX_CONTROL and LAP header */
return -ENOMEM;
/* Reserve space for MUX_CONTROL and LAP header */
- skb_reserve(tx_skb, TTP_MAX_HEADER);
+ skb_reserve(tx_skb, TTP_MAX_HEADER
+ TTP_SAR_HEADER
);
} else {
tx_skb = userdata;
/*
} else {
tx_skb = userdata;
/*