rpms/kernel/F-10 irda-add-irda-skb-cb-qdisc-related-padding.patch, NONE, 1.1.2.1 kernel.spec, 1.1206.2.101, 1.1206.2.102

[Chuck Ebbert]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4696

Modified Files:
      Tag: private-fedora-10-2_6_27
	kernel.spec 
Added Files:
      Tag: private-fedora-10-2_6_27
	irda-add-irda-skb-cb-qdisc-related-padding.patch 
Log Message:
Fix broken IrDA stack in 2.6.27 (#508874)

irda-add-irda-skb-cb-qdisc-related-padding.patch:
 irda_device.h |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE irda-add-irda-skb-cb-qdisc-related-padding.patch ---
From: Samuel Ortiz <samuel at sortiz.org>
Date: Wed, 17 Dec 2008 23:44:58 +0000 (-0800)
Subject: irda: Add irda_skb_cb qdisc related padding
X-Git-Tag: v2.6.28-rc9~3^2~1
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=69c30e1e7492192f882a3fc11888b320fde5206a

irda: Add irda_skb_cb qdisc related padding

We need to pad irda_skb_cb in order to keep it safe accross dev_queue_xmit()
calls. This is some ugly and temporary hack triggered by recent qisc code
changes.
Even though it fixes bugzilla.kernel.org bug #11795, it will be replaced by a
proper fix before 2.6.29 is released.

Signed-off-by: Samuel Ortiz <samuel at sortiz.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
---

diff --git a/include/net/irda/irda_device.h b/include/net/irda/irda_device.h
index 3025ae1..94c852d 100644
--- a/include/net/irda/irda_device.h
+++ b/include/net/irda/irda_device.h
@@ -135,9 +135,11 @@ struct dongle_reg {
 
 /* 
  * Per-packet information we need to hide inside sk_buff 
- * (must not exceed 48 bytes, check with struct sk_buff) 
+ * (must not exceed 48 bytes, check with struct sk_buff)
+ * The default_qdisc_pad field is a temporary hack.
  */
 struct irda_skb_cb {
+	unsigned int default_qdisc_pad;
 	magic_t magic;       /* Be sure that we can trust the information */
 	__u32   next_speed;  /* The Speed to be set *after* this frame */
 	__u16   mtt;         /* Minimum turn around time */


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1206.2.101
retrieving revision 1.1206.2.102
diff -u -p -r1.1206.2.101 -r1.1206.2.102
--- kernel.spec	11 Oct 2009 22:08:52 -0000	1.1206.2.101
+++ kernel.spec	12 Oct 2009 00:40:13 -0000	1.1206.2.102
@@ -794,6 +794,9 @@ Patch15230: sky2-set-sky2_hw_ram_buffer-
 Patch15240: tcp-fix-config_tcp_md5sig-config_preempt-timer-bug.patch
 Patch15250: x86-fix-csum_ipv6_magic-asm-memory-clobber.patch
 
+# Fix broken IrDA stack in 2.6.27 (#508874)
+Patch15300: irda-add-irda-skb-cb-qdisc-related-padding.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1437,6 +1440,9 @@ ApplyPatch sky2-set-sky2_hw_ram_buffer-i
 ApplyPatch tcp-fix-config_tcp_md5sig-config_preempt-timer-bug.patch
 ApplyPatch x86-fix-csum_ipv6_magic-asm-memory-clobber.patch
 
+# Fix broken IrDA stack in 2.6.27 (#508874)
+ApplyPatch irda-add-irda-skb-cb-qdisc-related-padding.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2012,6 +2018,9 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Sun Oct 11 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.27.37-170.2.102.rc1
+- Fix broken IrDA stack in 2.6.27 (#508874)
+
 * Sun Oct 11 2009  Chuck Ebbert <cebbert at redhat.com>  2.6.27.37-170.2.101.rc1
 - Networking fixes from 2.6.31-stable:
   ax25-fix-possible-oops-in-ax25_make_new.patch