Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

1 files changed, 5 insertions, 0 deletions

diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c
index 0b0f1c407a7e..f42c23f42652 100644
--- a/drivers/net/dm9000.c
+++ b/drivers/net/dm9000.c
@@ -1374,6 +1374,11 @@ dm9000_probe(struct platform_device *pdev)
         for (i = 0; i < 6; i += 2)
                 dm9000_read_eeprom(db, i / 2, ndev->dev_addr+i);
 
+        if (!is_valid_ether_addr(ndev->dev_addr) && pdata != NULL) {
+                mac_src = "platform data";
+                memcpy(ndev->dev_addr, pdata->dev_addr, 6);
+        }
+
         if (!is_valid_ether_addr(ndev->dev_addr)) {
                 /* try reading from mac */