rpms/kernel/devel linux-2.6-iwl3945-ibss-tsf-fix.patch, NONE, 1.1 kernel.spec, 1.1094, 1.1095

[John W. Linville]

Author: linville

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

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-iwl3945-ibss-tsf-fix.patch 
Log Message:
iwl3945 fix for stable ad-hoc mode connections (#459401)

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
 };


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1094
retrieving revision 1.1095
diff -u -r1.1094 -r1.1095
--- kernel.spec	27 Oct 2008 20:40:04 -0000	1.1094
+++ kernel.spec	27 Oct 2008 22:06:53 -0000	1.1095
@@ -636,6 +636,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
 Patch690: linux-2.6-at76.patch
 
 Patch700: linux-2.6-nfs-client-mounts-hang.patch
@@ -1226,6 +1227,8 @@
 #ApplyPatch linux-2.6-iwlwifi-use-dma_alloc_coherent.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
 
 # Add misc wireless bits from upstream wireless tree
 ApplyPatch linux-2.6-at76.patch
@@ -1875,6 +1878,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Tue Oct 28 2008 John W. Linville <linville at redhat.com>
+- iwl3945 fix for stable ad-hoc mode connections (#459401)
+
 * Tue Oct 28 2008 Dave Airlie <airlied at redhat.com>
 - add support for wait rendering API