---

yaml --- r: 107997 b: refs/heads/master c: fe41424 h: refs/heads/master i: 107995: e21c1e2 v: v3
git-mirror · Aug 7, 2008 · 23a2f98 · 23a2f98
1 parent b9a2226
commit 23a2f98
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9a5d3414202a21ed4b053657345ea0fd492d513a
+refs/heads/master: fe414248551e2880fe8913577699003ff145ab9d
diff --git a/trunk/drivers/net/dm9000.c b/trunk/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 */
 

diff --git a/trunk/include/linux/dm9000.h b/trunk/include/linux/dm9000.h
@@ -27,6 +27,7 @@
 
 struct dm9000_plat_data {
 	unsigned int	flags;
+	unsigned char	dev_addr[6];
 
 	/* allow replacement IO routines */