| Date | Wed, 16 Apr 2008 18:02:09 -0700 | From | Chris Wright <> | Subject | sis190: read the mac address from the eeprom first |
| |
-stable review patch. If anyone has any objections, please let us know. ---------------------
From: Francois Romieu <romieu@fr.zoreil.com>
upstream commit: 563e0ae06ff18f0b280f11cf706ba0172255ce52
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@fr.zoreil.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
dsd@gentoo.org notes: This patch fixes http://bugs.gentoo.org/207706
Cc: Daniel Drake <dsd@gentoo.org> Signed-off-by: Chris Wright <chrisw@sous-sol.org> --- drivers/net/sis190.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
--- a/drivers/net/sis190.c +++ b/drivers/net/sis190.c @@ -1632,13 +1632,18 @@ static inline void sis190_init_rxfilter( static int 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, ®); - 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) --
|