rpms/kernel/F-9 linux-2.6-hostap-skb-cb-hack.patch, NONE, 1.1 linux-2.6-iwl3945-ibss-tsf-fix.patch, NONE, 1.1 linux-2.6-iwlagn-downgrade-BUG_ON-in-interrupt.patch, NONE, 1.1 kernel.spec, 1.829, 1.830

[Chuck Ebbert]

Author: cebbert

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

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-hostap-skb-cb-hack.patch 
	linux-2.6-iwl3945-ibss-tsf-fix.patch 
	linux-2.6-iwlagn-downgrade-BUG_ON-in-interrupt.patch 
Log Message:
Three wireless fixes from F10.

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)

linux-2.6-iwl3945-ibss-tsf-fix.patch:

--- NEW FILE linux-2.6-iwl3945-ibss-tsf-fix.patch ---
commit e9f37e27a0db5f2026e5ab33e47faf4e558050af
Author: Fabrice Bellet <fabrice at bellet.info>
Date:   Thu Oct 23 23:48:57 2008 -0700

    iwl3945: iwl3945_mac_get_tsf() should not return zero
    
    The problem fixed here is that iwl3945_mac_get_tsf() returns 0, as the
    function is not implemented, and this is considered as a valid value by
    the mac layer in mlme.c:1605. The consequence is that the STA in ad-hoc
    mode is inserted/removed quite frequently due to IBSS merging.
    
    This patch fixes :
    http://www.intellinuxwireless.org/bugzilla/show_bug.cgi?id=1781
    and https://bugzilla.redhat.com/show_bug.cgi?id=459401
    
    Signed-off-by: Fabrice Bellet <fabrice at bellet.info>
    Acked-by: Tomas Winkler <tomas.winkler at intel.com>
    Signed-off-by: Reinette Chatre <reinette.chatre at intel.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

(Rebased to match current Rawhide kernel... -- JWL)

diff -up linux-2.6.27.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c.orig linux-2.6.27.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c
--- linux-2.6.27.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c.orig	2008-10-09 18:13:53.000000000 -0400
+++ linux-2.6.27.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c	2008-10-27 17:41:59.000000000 -0400
@@ -7164,14 +7164,6 @@ static int iwl3945_mac_get_stats(struct 
 	return 0;
 }
 
-static u64 iwl3945_mac_get_tsf(struct ieee80211_hw *hw)
-{
-	IWL_DEBUG_MAC80211("enter\n");
-	IWL_DEBUG_MAC80211("leave\n");
-
-	return 0;
-}
-
 static void iwl3945_mac_reset_tsf(struct ieee80211_hw *hw)
 {
 	struct iwl3945_priv *priv = hw->priv;
@@ -7828,7 +7820,6 @@ static struct ieee80211_ops iwl3945_hw_o
 	.get_stats = iwl3945_mac_get_stats,
 	.get_tx_stats = iwl3945_mac_get_tx_stats,
 	.conf_tx = iwl3945_mac_conf_tx,
-	.get_tsf = iwl3945_mac_get_tsf,
 	.reset_tsf = iwl3945_mac_reset_tsf,
 	.hw_scan = iwl3945_mac_hw_scan
 };

linux-2.6-iwlagn-downgrade-BUG_ON-in-interrupt.patch:

--- NEW FILE linux-2.6-iwlagn-downgrade-BUG_ON-in-interrupt.patch ---
From: Johannes Berg <johannes at sipsolutions.net>
Date: Tue, 23 Sep 2008 17:18:43 +0000 (+0200)
Subject: iwlagn: downgrade BUG_ON in interrupt
X-Git-Tag: master-2008-09-30~22
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Flinville%2Fwireless-testing.git;a=commitdiff_plain;h=98fa49592bea0fe5749973ab9fc6b3f00ce2ea82

iwlagn: downgrade BUG_ON in interrupt

This BUG_ON really shouldn't trigger, but if it does, as on my machine,
it leaves you wondering what happened because you won't see it. Let's
instead leak a bit of state and memory and at least make it possible to
report it to the kerneloops project to track it.

Signed-off-by: Johannes Berg <johannes at sipsolutions.net>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
---

diff --git a/drivers/net/wireless/iwlwifi/iwl-tx.c b/drivers/net/wireless/iwlwifi/iwl-tx.c
index e9feca4..907a53e 100644
--- a/drivers/net/wireless/iwlwifi/iwl-tx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-tx.c
@@ -1200,10 +1200,9 @@ void iwl_tx_cmd_complete(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb)
 	/* If a Tx command is being handled and it isn't in the actual
 	 * command queue then there a command routing bug has been introduced
 	 * in the queue management code. */
-	if (txq_id != IWL_CMD_QUEUE_NUM)
-		IWL_ERROR("Error wrong command queue %d command id 0x%X\n",
-			  txq_id, pkt->hdr.cmd);
-	BUG_ON(txq_id != IWL_CMD_QUEUE_NUM);
+	if (WARN(txq_id != IWL_CMD_QUEUE_NUM,
+		 "wrong command queue %d, command id 0x%X\n", txq_id, pkt->hdr.cmd))
+		return;
 
 	cmd_index = get_cmd_index(&priv->txq[IWL_CMD_QUEUE_NUM].q, index, huge);
 	cmd = priv->txq[IWL_CMD_QUEUE_NUM].cmd[cmd_index];


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.829
retrieving revision 1.830
diff -u -r1.829 -r1.830
--- kernel.spec	30 Oct 2008 20:56:04 -0000	1.829
+++ kernel.spec	30 Oct 2008 21:06:39 -0000	1.830
@@ -658,7 +658,10 @@
 Patch678: linux-2.6-libata-sata_nv-disable-swncq.patch
 
 # wireless
-Patch699: linux-2.6-at76.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
 
@@ -1225,6 +1228,13 @@
 # cciss sysfs links are broken
 ApplyPatch linux-2.6-blk-cciss-fix-regression-sysfs-symlink-missing.patch
 
+# make jarod's iwl4965 not panic near N APs, hopefully
+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
 
@@ -1890,6 +1900,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Thu Oct 30 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.4-17
+- Three wireless fixes from F10.
+
 * Thu Oct 30 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.4-16
 - Two more fixes from F10:
   Fix missing key-up events on Dell notebook keyboards.