From 08167dfd28903156ddd1570f0562f566d0b4ce93 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@linux-foundation.org>
Date: Fri, 2 Feb 2007 08:22:51 -0800
Subject: [PATCH] --- yaml --- r: 46577 b: refs/heads/master c:
 fae87592280039837fdd72c5ecdac2af2eb97f63 h: refs/heads/master i:   46575:
 8ed4157a4e801f4362957ff3acff9213d95e7216 v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/net/skge.c | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 11e9aca44d11..7cee40b90b1a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a7bed27dc69e3bc9238549a4964ea94ec318362c
+refs/heads/master: fae87592280039837fdd72c5ecdac2af2eb97f63
diff --git a/trunk/drivers/net/skge.c b/trunk/drivers/net/skge.c
index 45283f3f95e4..ce25b6f505c4 100644
--- a/trunk/drivers/net/skge.c
+++ b/trunk/drivers/net/skge.c
@@ -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);
 
@@ -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);