rpms/kernel/devel linux-2.6-hostap-skb-cb-hack.patch, NONE, 1.1 kernel.spec, 1.1097, 1.1098

[John W. Linville]

Author: linville

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25645

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-hostap-skb-cb-hack.patch 
Log Message:
hostap hack to still work w/ quetionable skb->cb usage

linux-2.6-hostap-skb-cb-hack.patch:

--- NEW FILE linux-2.6-hostap-skb-cb-hack.patch ---
diff -up linux-2.6.27.noarch/drivers/net/wireless/hostap/hostap_wlan.h.orig linux-2.6.27.noarch/drivers/net/wireless/hostap/hostap_wlan.h
--- linux-2.6.27.noarch/drivers/net/wireless/hostap/hostap_wlan.h.orig	2008-10-28 13:05:26.000000000 -0400
+++ linux-2.6.27.noarch/drivers/net/wireless/hostap/hostap_wlan.h	2008-10-28 13:05:30.000000000 -0400
@@ -918,9 +918,12 @@ struct hostap_interface {
 
 /*
  * TX meta data - stored in skb->cb buffer, so this must not be increased over
- * the 40-byte limit
+ * the 48-byte limit.
+ * THE PADDING THIS STARTS WITH IS A HORRIBLE HACK THAT SHOULD NOT LIVE
+ * TO SEE THE DAY.
  */
 struct hostap_skb_tx_data {
+	unsigned int __padding_for_default_qdiscs;
 	u32 magic; /* HOSTAP_SKB_TX_DATA_MAGIC */
 	u8 rate; /* transmit rate */
 #define HOSTAP_TX_FLAGS_WDS BIT(0)


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1097
retrieving revision 1.1098
diff -u -r1.1097 -r1.1098
--- kernel.spec	28 Oct 2008 10:45:51 -0000	1.1097
+++ kernel.spec	28 Oct 2008 17:10:35 -0000	1.1098
@@ -637,6 +637,7 @@
 #Patch680: linux-2.6-iwlwifi-use-dma_alloc_coherent.patch
 Patch681: linux-2.6-iwlagn-downgrade-BUG_ON-in-interrupt.patch
 Patch682: linux-2.6-iwl3945-ibss-tsf-fix.patch
+Patch683: linux-2.6-hostap-skb-cb-hack.patch
 Patch690: linux-2.6-at76.patch
 
 Patch700: linux-2.6-nfs-client-mounts-hang.patch
@@ -1232,6 +1233,8 @@
 ApplyPatch linux-2.6-iwlagn-downgrade-BUG_ON-in-interrupt.patch
 # iwl3945 fix for stable ad-hoc mode connections (#459401)
 ApplyPatch linux-2.6-iwl3945-ibss-tsf-fix.patch
+# hostap hack to still work w/ quetionable skb->cb usage
+ApplyPatch linux-2.6-hostap-skb-cb-hack.patch
 
 # Add misc wireless bits from upstream wireless tree
 ApplyPatch linux-2.6-at76.patch
@@ -1883,6 +1886,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Tue Oct 28 2008 John W. Linville <linville at redhat.com>
+- hostap hack to still work w/ quetionable skb->cb usage
+
 * Tue Oct 28 2008 Dave Airlie <airlied at redhat.com>
 - modesetting add some debugging in /proc and pad ring writes