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

[maximilian attems]

Author: maks-guest
Date: Mon Jan 15 13:57:53 2007
New Revision: 8189

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/net-bcm43xx_watchdog.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/9
Log:
bcm43xx stable line


Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Mon Jan 15 13:57:53 2007
@@ -87,7 +87,7 @@
     - EBTABLES: Prevent wraparounds in checks for entry components' sizes.
     - skip data conversion in compat_sys_mount when data_page is NULL
     - bonding: incorrect bonding state reported via ioctl
-    - x86-64: Mark rdtsc as sync only for netburst, not for core2 
+    - x86-64: Mark rdtsc as sync only for netburst, not for core2
       (closes: #406767)
     - dm crypt: Fix data corruption with dm-crypt over RAID5 (closes: #402812)
     - forcedeth: Disable INTx when enabling MSI in forcedeth
@@ -147,6 +147,8 @@
     Thanks Jurij Smakov <jurij at wooyd.org> (closes: #334104, #405203)
   * amd64, i386: Disable SK98LIN as SKGE is the modern capable driver.
     (closes: 405196)
+  * Backout net-bcm43xx_netdev_watchdog.patch and push 2.6.18.2 fix.
+    (closes: 402475)
 
   [ Jurij Smakov ]
   * Add bugfix/sparc/isa-dev-no-reg.patch to make sure that
@@ -158,7 +160,7 @@
     memory accesses in ehci-hub-control() by adding an alignment attribute
     to the tbuf array declaration. Thanks to David Miller for the patch.
 
- -- maximilian attems <maks at stro.at>  Mon, 15 Jan 2007 13:43:23 +0100
+ -- maximilian attems <maks at stro.at>  Mon, 15 Jan 2007 13:49:59 +0100
 
 linux-2.6 (2.6.18-8) unstable; urgency=low
 

Added: dists/sid/linux-2.6/debian/patches/bugfix/net-bcm43xx_watchdog.patch
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/bugfix/net-bcm43xx_watchdog.patch	Mon Jan 15 13:57:53 2007
@@ -0,0 +1,20 @@
+diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_main.c b/drivers/net/wireless/bcm43xx/bcm43xx_main.c
+index 3a73d89..f24ba4d 100644
+--- a/drivers/net/wireless/bcm43xx/bcm43xx_main.c
++++ b/drivers/net/wireless/bcm43xx/bcm43xx_main.c
+@@ -3165,7 +3165,15 @@ static void bcm43xx_periodic_work_handle
+ 
+ 	badness = estimate_periodic_work_badness(bcm->periodic_state);
+ 	mutex_lock(&bcm->mutex);
++
++	/* We must fake a started transmission here, as we are going to
++	 * disable TX. If we wouldn't fake a TX, it would be possible to
++	 * trigger the netdev watchdog, if the last real TX is already
++	 * some time on the past (slightly less than 5secs)
++	 */
++	bcm->net_dev->trans_start = jiffies;
+ 	netif_tx_disable(bcm->net_dev);
++
+ 	spin_lock_irqsave(&bcm->irq_lock, flags);
+ 	if (badness > BADNESS_LIMIT) {
+ 		/* Periodic work will take a long time, so we want it to

Modified: dists/sid/linux-2.6/debian/patches/series/9
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/9	(original)
+++ dists/sid/linux-2.6/debian/patches/series/9	Mon Jan 15 13:57:53 2007
@@ -54,3 +54,5 @@
 + bugfix/drivers-net-tg3-reset.patch 
 + bugfix/acpi_pm-re-add-verify_mptmr_rate.patch
 + bugfix/proc-swaps-missing-header.patch
+- bugfix/net-bcm43xx_netdev_watchdog.patch
++ bugfix/net-bcm43xx_watchdog.patch