---

yaml --- r: 170693 b: refs/heads/master c: aace495 h: refs/heads/master i: 170691: 48b732e v: v3
git-mirror · Oct 13, 2009 · 4a70318 · 4a70318
1 parent a0e01d0
commit 4a70318
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b4efc5610980bc4b65a6cb49b939cf5f7dfa2723
+refs/heads/master: aace495933a981274b6491d71b915165a61defdc
diff --git a/trunk/drivers/net/smsc911x.c b/trunk/drivers/net/smsc911x.c
@@ -2071,6 +2071,9 @@ static int __devinit smsc911x_drv_probe(struct platform_device *pdev)
 	if (is_valid_ether_addr(dev->dev_addr)) {
 		smsc911x_set_hw_mac_address(pdata, dev->dev_addr);
 		SMSC_TRACE(PROBE, "MAC Address is specified by configuration");
+	} else if (is_valid_ether_addr(pdata->config.mac)) {
+		memcpy(dev->dev_addr, pdata->config.mac, 6);
+		SMSC_TRACE(PROBE, "MAC Address specified by platform data");
 	} else {
 		/* Try reading mac address from device. if EEPROM is present
 		 * it will already have been set */

diff --git a/trunk/include/linux/smsc911x.h b/trunk/include/linux/smsc911x.h
@@ -30,6 +30,7 @@ struct smsc911x_platform_config {
 	unsigned int irq_type;
 	unsigned int flags;
 	phy_interface_t phy_interface;
+	unsigned char mac[6];
 };
 
 /* Constants for platform_device irq polarity configuration */