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

[Bastian Blank]

Author: waldi
Date: Tue Jan  9 22:50:34 2007
New Revision: 8154

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/drivers-net-tg3-reset.patch   (contents, props changed)
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/9
Log:
Fix tg3 reset.

* debian/changelog: Update.
* debian/patches/bugfix/drivers-net-tg3-reset.patch: Add.
* debian/patches/series/9: Update.


Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Tue Jan  9 22:50:34 2007
@@ -27,6 +27,7 @@
   * Update xen patch to changeset 36186 from Fedora 2.6.18 branch.
   * i386/xen: Build only the pae version. (closes: #390862)
   * hppa: Override host type when necessary.
+  * Fix tg3 reset.
 
   [ dann frazier ]
   * Fix potential fragmentation attacks in ip6_tables (CVE-2006-4572)
@@ -149,7 +150,7 @@
     memory accesses in ehci-hub-control() by adding an alignment attribute
     to the tbuf array declaration. Thanks to David Miller for the patch.
 
- -- dann frazier <dannf at debian.org>  Mon,  8 Jan 2007 15:40:54 -0700
+ -- Bastian Blank <waldi at debian.org>  Tue,  9 Jan 2007 22:48:02 +0100
 
 linux-2.6 (2.6.18-8) unstable; urgency=low
 

Added: dists/sid/linux-2.6/debian/patches/bugfix/drivers-net-tg3-reset.patch
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/bugfix/drivers-net-tg3-reset.patch	Tue Jan  9 22:50:34 2007
@@ -0,0 +1,22 @@
+diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
+index 8e39849..8f059b7 100644
+--- a/drivers/net/tg3.c
++++ b/drivers/net/tg3.c
+@@ -6014,7 +6014,7 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
+ 		tg3_abort_hw(tp, 1);
+ 	}
+ 
+-	if ((tp->tg3_flags2 & TG3_FLG2_MII_SERDES) && reset_phy)
++	if (reset_phy)
+ 		tg3_phy_reset(tp);
+ 
+ 	err = tg3_chip_reset(tp);
+@@ -6574,7 +6574,7 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
+ 		tw32(GRC_LOCAL_CTRL, tp->grc_local_ctrl);
+ 	}
+ 
+-	err = tg3_setup_phy(tp, reset_phy);
++	err = tg3_setup_phy(tp, 0);
+ 	if (err)
+ 		return err;
+ 

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	Tue Jan  9 22:50:34 2007
@@ -51,3 +51,4 @@
 - features/arm/ixp4xx-0.2.1-driver.patch
 + features/arm/ixp4xx-npe-driver-0.3.1.patch
 + features/arm/ixp4xx-net-driver-improve-mac-handling-0.3.1.patch
++ bugfix/drivers-net-tg3-reset.patch