[gentoo-commits] linux-patches r1254 - genpatches-2.6/trunk/2.6.24

[Daniel Drake (dsd)]

Author: dsd
Date: 2008-02-24 23:29:13 +0000 (Sun, 24 Feb 2008)
New Revision: 1254

Added:
   genpatches-2.6/trunk/2.6.24/2405_sis190-eeprom-mac.patch
Modified:
   genpatches-2.6/trunk/2.6.24/0000_README
Log:
Fix reading of MAC address in sis190 driver

Modified: genpatches-2.6/trunk/2.6.24/0000_README
===================================================================
--- genpatches-2.6/trunk/2.6.24/0000_README	2008-02-24 23:25:27 UTC (rev 1253)
+++ genpatches-2.6/trunk/2.6.24/0000_README	2008-02-24 23:29:13 UTC (rev 1254)
@@ -63,6 +63,10 @@
 From:	http://bugs.gentoo.org/209235
 Desc:	Fix e1000e bridging issue
 
+Patch:	2405_sis190-eeprom-mac.patch
+From:	http://bugs.gentoo.org/207706
+Desc:	Fix reading of MAC address in sis190 driver
+
 Patch:	1400_vmsplice-user-pointer.patch
 From:	http://bugs.gentoo.org/209460
 Desc:	Fix another vmsplice() security issue

Added: genpatches-2.6/trunk/2.6.24/2405_sis190-eeprom-mac.patch
===================================================================
--- genpatches-2.6/trunk/2.6.24/2405_sis190-eeprom-mac.patch	                        (rev 0)
+++ genpatches-2.6/trunk/2.6.24/2405_sis190-eeprom-mac.patch	2008-02-24 23:29:13 UTC (rev 1254)
@@ -0,0 +1,45 @@
+From: Francois Romieu <romieu@×××××××××.com>
+Date: Mon, 18 Feb 2008 20:20:32 +0000 (+0100)
+Subject: sis190: read the mac address from the eeprom first
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fjgarzik%2Fnetdev-2.6.git;a=commitdiff_plain;h=563e0ae06ff18f0b280f11cf706ba0172255ce52
+
+sis190: read the mac address from the eeprom first
+
+Reading a serie of zero from the cmos sram area do not work
+well with is_valid_ether_addr(). Let's read the mac address
+from the eeprom first as it seems more reliable.
+
+Fix for http://bugzilla.kernel.org/show_bug.cgi?id=9831
+
+Signed-off-by: Francois Romieu <romieu@×××××××××.com>
+Signed-off-by: Jeff Garzik <jeff@××××××.org>
+---
+
+diff --git a/drivers/net/sis190.c b/drivers/net/sis190.c
+index 202fdf3..20745fd 100644
+--- a/drivers/net/sis190.c
++++ b/drivers/net/sis190.c
+@@ -1633,13 +1633,18 @@ static inline void sis190_init_rxfilter(struct net_device *dev)
+ static int __devinit sis190_get_mac_addr(struct pci_dev *pdev, 
+ 					 struct net_device *dev)
+ {
+-	u8 from;
++	int rc;
++
++	rc = sis190_get_mac_addr_from_eeprom(pdev, dev);
++	if (rc < 0) {
++		u8 reg;
+ 
+-	pci_read_config_byte(pdev, 0x73, &from);
++		pci_read_config_byte(pdev, 0x73, &reg);
+ 
+-	return (from & 0x00000001) ?
+-		sis190_get_mac_addr_from_apc(pdev, dev) :
+-		sis190_get_mac_addr_from_eeprom(pdev, dev);
++		if (reg & 0x00000001)
++			rc = sis190_get_mac_addr_from_apc(pdev, dev);
++	}
++	return rc;
+ }
+ 
+ static void sis190_set_speed_auto(struct net_device *dev)

-- 
gentoo-commits@l.g.o mailing list