2007-02-03 02:39:09

by Chris Wright

[permalink] [raw]
Subject: [patch 33/59] sis190: failure to set the MAC address from EEPROM

-stable review patch. If anyone has any objections, please let us know.
------------------

From: Francois Romieu <[email protected]>

Fix from http://bugzilla.kernel.org/show_bug.cgi?id=7747

Signed-off-by: Andrew Morton <[email protected]>
Cc: <[email protected]>
Signed-off-by: Francois Romieu <[email protected]>
Signed-off-by: Jeff Garzik <[email protected]>
Signed-off-by: Chris Wright <[email protected]>
---
drivers/net/sis190.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

--- linux-2.6.19.2.orig/drivers/net/sis190.c
+++ linux-2.6.19.2/drivers/net/sis190.c
@@ -1559,7 +1559,7 @@ static int __devinit sis190_get_mac_addr
for (i = 0; i < MAC_ADDR_LEN / 2; i++) {
__le16 w = sis190_read_eeprom(ioaddr, EEPROMMACAddr + i);

- ((u16 *)dev->dev_addr)[0] = le16_to_cpu(w);
+ ((u16 *)dev->dev_addr)[i] = le16_to_cpu(w);
}

sis190_set_rgmii(tp, sis190_read_eeprom(ioaddr, EEPROMInfo));

--