Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 46577
b: refs/heads/master
c: fae8759
h: refs/heads/master
i:
  46575: 8ed4157
v: v3
  • Loading branch information
Stephen Hemminger authored and Jeff Garzik committed Feb 7, 2007
1 parent 5e8ff71 commit 08167df
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a7bed27dc69e3bc9238549a4964ea94ec318362c
refs/heads/master: fae87592280039837fdd72c5ecdac2af2eb97f63
8 changes: 5 additions & 3 deletions trunk/drivers/net/skge.c
Original file line number Diff line number Diff line change
Expand Up @@ -2373,6 +2373,9 @@ static int skge_up(struct net_device *dev)
size_t rx_size, tx_size;
int err;

if (!is_valid_ether_addr(dev->dev_addr))
return -EINVAL;

if (netif_msg_ifup(skge))
printk(KERN_INFO PFX "%s: enabling interface\n", dev->name);

Expand Down Expand Up @@ -3567,11 +3570,10 @@ static int __devinit skge_probe(struct pci_dev *pdev,
if (!dev)
goto err_out_led_off;

/* Some motherboards are broken and has zero in ROM. */
if (!is_valid_ether_addr(dev->dev_addr)) {
printk(KERN_ERR PFX "%s: bad (zero?) ethernet address in rom\n",
printk(KERN_WARNING PFX "%s: bad (zero?) ethernet address in rom\n",
pci_name(pdev));
err = -EIO;
goto err_out_free_netdev;
}

err = register_netdev(dev);
Expand Down

0 comments on commit 08167df

Please sign in to comment.