[kernel] r12261 - in dists/sid/linux-2.6/debian: . patches/bugfix/all patches/series

[Martin Michlmayr]

Author: tbm
Date: Sat Sep 27 14:15:31 2008
New Revision: 12261

Log:
No longer disable ATH5K.


Added:
   dists/sid/linux-2.6/debian/patches/bugfix/all/ath5-fix-bad-udelay.patch
   dists/sid/linux-2.6/debian/patches/series/7
Modified:
   dists/sid/linux-2.6/debian/changelog

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Sat Sep 27 14:15:31 2008
@@ -12,6 +12,8 @@
 
   [ Martin Michlmayr ]
   * [arm/orion5x] Enable CONFIG_ATALK (requested by Ben Schwarz).
+  * ath5k: Fix bad udelay calls on AR5210 code (Nick Kossifidis).
+  * [arm] No longer disable ATH5K.
 
  -- Bastian Blank <waldi at debian.org>  Wed, 24 Sep 2008 15:18:27 +0200
 

Added: dists/sid/linux-2.6/debian/patches/bugfix/all/ath5-fix-bad-udelay.patch
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/ath5-fix-bad-udelay.patch	Sat Sep 27 14:15:31 2008
@@ -0,0 +1,28 @@
+ath5k: Fix bad udelay calls on AR5210 code
+
+Based on a patch by Nick Kossifidis <mick at madwifi.org>
+http://git.kernel.org/?p=linux/kernel/git/davem/net-next-2.6.git;a=commitdiff;h=84e463fa0786a105c39281b90f8e3b6fe1444a05
+
+--- a/drivers/net/wireless/ath5k/hw.c	2008-09-27 12:45:23.000000000 +0000
++++ b/drivers/net/wireless/ath5k/hw.c	2008-09-27 12:45:40.000000000 +0000
+@@ -507,7 +507,7 @@
+ 	}
+ 
+ 	if (ah->ah_version == AR5K_AR5210)
+-		udelay(2300);
++		mdelay(2);
+ 
+ 	/* ...wakeup again!*/
+ 	ret = ath5k_hw_set_power(ah, AR5K_PM_AWAKE, true, 0);
+diff -urN drivers/net/wireless/ath5k~/phy.c drivers/net/wireless/ath5k/phy.c
+--- a/drivers/net/wireless/ath5k/phy.c	2008-09-27 12:45:23.000000000 +0000
++++ b/drivers/net/wireless/ath5k/phy.c	2008-09-27 12:45:54.000000000 +0000
+@@ -2001,7 +2001,7 @@
+ 	beacon = ath5k_hw_reg_read(ah, AR5K_BEACON_5210);
+ 	ath5k_hw_reg_write(ah, beacon & ~AR5K_BEACON_ENABLE, AR5K_BEACON_5210);
+ 
+-	udelay(2300);
++	mdelay(2);
+ 
+ 	/*
+ 	 * Set the channel (with AGC turned off)

Added: dists/sid/linux-2.6/debian/patches/series/7
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/series/7	Sat Sep 27 14:15:31 2008
@@ -0,0 +1,2 @@
++ bugfix/all/ath5-fix-bad-udelay.patch
+- bugfix/arm/disable-ath5k.patch