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

Commit f92d8728 authored by Malli Chilakala's avatar Malli Chilakala Committed by Jeff Garzik
Browse files

[PATCH] e100: e100_eeprom_load was called after e100_phy_init 



e100_eeprom_load was called after e100_phy_init causing phy_init
not to use values set in EEPROM - from emann@mrv.com

Signed-off-by: default avatarMallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
Signed-off-by: default avatarGanesh Venkatesan <ganesh.venkatesan@intel.com>
Signed-off-by: default avatarJohn Ronciak <john.ronciak@intel.com>
parent 64895145

drivers/net/e100.c

+2 −2
Original line number Diff line number Diff line
@@ -2340,11 +2340,11 @@ static int __devinit e100_probe(struct pci_dev *pdev, 
		goto err_out_iounmap;

	}



	e100_phy_init(nic);



	if((err = e100_eeprom_load(nic)))

		goto err_out_free;



	e100_phy_init(nic);



	memcpy(netdev->dev_addr, nic->eeprom, ETH_ALEN);

	if(!is_valid_ether_addr(netdev->dev_addr)) {

		DPRINTK(PROBE, ERR, "Invalid MAC address from "