aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/e100.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/drivers/net/e100.c b/drivers/net/e100.c
index 71c6d334bd7f..135617c5941f 100644
--- a/drivers/net/e100.c
+++ b/drivers/net/e100.c
@@ -2597,11 +2597,16 @@ static int __devinit e100_probe(struct pci_dev *pdev,
2597 2597
2598 memcpy(netdev->dev_addr, nic->eeprom, ETH_ALEN); 2598 memcpy(netdev->dev_addr, nic->eeprom, ETH_ALEN);
2599 memcpy(netdev->perm_addr, nic->eeprom, ETH_ALEN); 2599 memcpy(netdev->perm_addr, nic->eeprom, ETH_ALEN);
2600 if(!is_valid_ether_addr(netdev->perm_addr)) { 2600 if (!is_valid_ether_addr(netdev->perm_addr)) {
2601 DPRINTK(PROBE, ERR, "Invalid MAC address from " 2601 if (!eeprom_bad_csum_allow) {
2602 "EEPROM, aborting.\n"); 2602 DPRINTK(PROBE, ERR, "Invalid MAC address from "
2603 err = -EAGAIN; 2603 "EEPROM, aborting.\n");
2604 goto err_out_free; 2604 err = -EAGAIN;
2605 goto err_out_free;
2606 } else {
2607 DPRINTK(PROBE, ERR, "Invalid MAC address from EEPROM, "
2608 "you MUST configure one.\n");
2609 }
2605 } 2610 }
2606 2611
2607 /* Wol magic packet can be enabled from eeprom */ 2612 /* Wol magic packet can be enabled from eeprom */