diff options
-rw-r--r-- | drivers/net/dm9000.c | 5 | ||||
-rw-r--r-- | include/linux/dm9000.h | 1 |
2 files changed, 6 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) | |||
1374 | for (i = 0; i < 6; i += 2) | 1374 | for (i = 0; i < 6; i += 2) |
1375 | dm9000_read_eeprom(db, i / 2, ndev->dev_addr+i); | 1375 | dm9000_read_eeprom(db, i / 2, ndev->dev_addr+i); |
1376 | 1376 | ||
1377 | if (!is_valid_ether_addr(ndev->dev_addr) && pdata != NULL) { | ||
1378 | mac_src = "platform data"; | ||
1379 | memcpy(ndev->dev_addr, pdata->dev_addr, 6); | ||
1380 | } | ||
1381 | |||
1377 | if (!is_valid_ether_addr(ndev->dev_addr)) { | 1382 | if (!is_valid_ether_addr(ndev->dev_addr)) { |
1378 | /* try reading from mac */ | 1383 | /* try reading from mac */ |
1379 | 1384 | ||
diff --git a/include/linux/dm9000.h b/include/linux/dm9000.h index fc82446b6425..c30879cf93bc 100644 --- a/include/linux/dm9000.h +++ b/include/linux/dm9000.h | |||
@@ -27,6 +27,7 @@ | |||
27 | 27 | ||
28 | struct dm9000_plat_data { | 28 | struct dm9000_plat_data { |
29 | unsigned int flags; | 29 | unsigned int flags; |
30 | unsigned char dev_addr[6]; | ||
30 | 31 | ||
31 | /* allow replacement IO routines */ | 32 | /* allow replacement IO routines */ |
32 | 33 | ||