mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 05:48:40 +00:00
e100: allow bad MAC address when running with invalid eeprom csum
Seved Torstendahl <seved.torstendahl@netinsight.net> suggested to let the module parameter for invalid eeprom checksum control the valid mac address test. If this bypass happens we should print a different message, or at least one that is correct, maybe something like below Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
parent
1211bb6dcd
commit
948cd43fed
1 changed files with 10 additions and 5 deletions
|
@ -2597,11 +2597,16 @@ static int __devinit e100_probe(struct pci_dev *pdev,
|
|||
|
||||
memcpy(netdev->dev_addr, nic->eeprom, ETH_ALEN);
|
||||
memcpy(netdev->perm_addr, nic->eeprom, ETH_ALEN);
|
||||
if(!is_valid_ether_addr(netdev->perm_addr)) {
|
||||
DPRINTK(PROBE, ERR, "Invalid MAC address from "
|
||||
"EEPROM, aborting.\n");
|
||||
err = -EAGAIN;
|
||||
goto err_out_free;
|
||||
if (!is_valid_ether_addr(netdev->perm_addr)) {
|
||||
if (!eeprom_bad_csum_allow) {
|
||||
DPRINTK(PROBE, ERR, "Invalid MAC address from "
|
||||
"EEPROM, aborting.\n");
|
||||
err = -EAGAIN;
|
||||
goto err_out_free;
|
||||
} else {
|
||||
DPRINTK(PROBE, ERR, "Invalid MAC address from EEPROM, "
|
||||
"you MUST configure one.\n");
|
||||
}
|
||||
}
|
||||
|
||||
/* Wol magic packet can be enabled from eeprom */
|
||||
|
|
Loading…
Reference in a new issue