diff options
| author | Francois Romieu <romieu@fr.zoreil.com> | 2008-02-18 21:20:32 +0100 |
|---|---|---|
| committer | Chris Wright <chrisw@sous-sol.org> | 2008-04-18 18:53:27 -0700 |
| commit | 93ea6ab18c1b1a511e168f9207d8c855822f90ff (patch) | |
| tree | 80d35a49bc8a782b95cc083c44c63ca82c5e6dda | |
| parent | 6cee5037c7c0950a80bd82f1c8c7dd6a22cd5422 (diff) | |
| download | kernel-common-93ea6ab18c1b1a511e168f9207d8c855822f90ff.tar.gz kernel-common-93ea6ab18c1b1a511e168f9207d8c855822f90ff.tar.bz2 kernel-common-93ea6ab18c1b1a511e168f9207d8c855822f90ff.zip | |
sis190: read the mac address from the eeprom first
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>
| -rw-r--r-- | drivers/net/sis190.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/drivers/net/sis190.c b/drivers/net/sis190.c index b570402f7fed..053eab669b2f 100644 --- a/drivers/net/sis190.c +++ b/drivers/net/sis190.c @@ -1632,13 +1632,18 @@ static inline void sis190_init_rxfilter(struct net_device *dev) 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) |