irda fix for 2.6.18

diff --git a/queue-2.6.18/irda-incorrect-ttp-header-reservation.patch b/queue-2.6.18/irda-incorrect-ttp-header-reservation.patch
new file mode 100644 (file)
index 0000000..cbb2899
--- /dev/null
+++ b/queue-2.6.18/irda-incorrect-ttp-header-reservation.patch
@@ -0,0 +1,42 @@
+From stable-bounces@linux.kernel.org  Thu Dec  7 15:37:55 2006
+Date: Fri, 8 Dec 2006 01:32:22 +0200
+From: Samuel Ortiz <samuel@sortiz.org>
+To: stable@kernel.org
+Message-ID: <20061207233222.GA4549@sortiz.org>
+Cc: "David S. Miller" <davem@davemloft.net>
+Subject: IrDA: Incorrect TTP header reservation
+
+From: Jeet Chaudhuri <jeetlinux@yahoo.co.in>
+
+We must reserve SAR + MAX_HEADER bytes for IrLMP to fit in.
+This fixes an oops reported (and fixed) by Jeet Chaudhuri, when max_sdu_size
+is greater than 0.
+
+Signed-off-by: Samuel Ortiz <samuel@sortiz.org>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Chris Wright <chrisw@sous-sol.org>
+
+---
+ net/irda/irttp.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- linux-2.6.18.5.orig/net/irda/irttp.c
++++ linux-2.6.18.5/net/irda/irttp.c
+@@ -1098,7 +1098,7 @@ int irttp_connect_request(struct tsap_cb
+                       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;
+               /*
+@@ -1346,7 +1346,7 @@ int irttp_connect_response(struct tsap_c
+                       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;
+               /*

diff --git a/queue-2.6.18/series b/queue-2.6.18/series
index 72e5426f212f58c90f4dbc5766c3265d95a3163e..cbd07eb25a96a45e557977282889b9a1c4e96052 100644 (file)
--- a/queue-2.6.18/series
+++ b/queue-2.6.18/series
@@ -11,3 +11,4 @@ sunhme-fix-for-sunhme-failures-on-x86.patch
 xfrm-use-output-device-disable_xfrm-for-forwarded-packets.patch
 dm-snapshot-fix-freeing-pending-exception.patch
 ipsec-fix-inetpeer-leak-in-ipv4-xfrm-dst-entries.patch
+irda-incorrect-ttp-header-reservation.patch