From 5246fe20541f204cb0daac9977b36e8d1eaa2556 Mon Sep 17 00:00:00 2001 From: Daniele Venzano Date: Wed, 14 Jan 2009 20:46:24 -0800 Subject: [PATCH] --- yaml --- r: 129773 b: refs/heads/master c: d1d5e6b1cead3df6f722d1d458874bd7f93da8d6 h: refs/heads/master i: 129771: c5c11ba11ae434924603e1194b5a31df4a013d63 v: v3 --- [refs] | 2 +- trunk/drivers/net/sis900.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 0bd0eea8ddf7..93d4fab7003c 100644 --- 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 index 6cbefcae9ac2..be4465bc0a69 100644 --- 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 */