---

yaml --- r: 129773 b: refs/heads/master c: d1d5e6b h: refs/heads/master i: 129771: c5c11ba v: v3
git-mirror · Jan 15, 2009 · 5246fe2 · 5246fe2
1 parent 42b7dee
commit 5246fe2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d7e094d4212bc72f5575e54edfef1349e0c4cdb5
+refs/heads/master: d1d5e6b1cead3df6f722d1d458874bd7f93da8d6
diff --git a/trunk/drivers/net/sis900.c b/trunk/drivers/net/sis900.c
@@ -509,10 +509,10 @@ static int __devinit sis900_probe(struct pci_dev *pci_dev,
 	else
 		ret = sis900_get_mac_addr(pci_dev, net_dev);
 
-	if (ret == 0) {
-		printk(KERN_WARNING "%s: Cannot read MAC address.\n", dev_name);
-		ret = -ENODEV;
-		goto err_unmap_rx;
+	if (!ret || !is_valid_ether_addr(net_dev->dev_addr)) {
+		random_ether_addr(net_dev->dev_addr);
+		printk(KERN_WARNING "%s: Unreadable or invalid MAC address,"
+				"using random generated one\n", dev_name);
 	}
 
 	/* 630ET : set the mii access mode as software-mode */