Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 563e0ae0 authored by Francois Romieu's avatar Francois Romieu Committed by Jeff Garzik
Browse files

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: default avatarFrancois Romieu <romieu@fr.zoreil.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 98e0f521

drivers/net/sis190.c

+10 −5
Original line number Diff line number Diff line
@@ -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)