[PATCH 1/2] net: enable smsc911x on MIPS

[PATCH 1/2] net: enable smsc911x on MIPS

[Manuel Lauss]

Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com>
---
 drivers/net/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 7127760..d9772af 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1001,7 +1001,7 @@ config SMC911X
 
 config SMSC911X
 	tristate "SMSC LAN911x/LAN921x families embedded ethernet support"
-	depends on ARM || SUPERH || BLACKFIN
+	depends on ARM || SUPERH || BLACKFIN || MIPS
 	select CRC32
 	select MII
 	select PHYLIB
-- 
1.6.5.rc2

[PATCH 2/2] net: smsc911x: allow platform_data to specify mac address

[Manuel Lauss]

Extend the driver to accept a MAC address specified in platform_data.

Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com>
---
 drivers/net/smsc911x.c   |    3 +++
 include/linux/smsc911x.h |    1 +
 2 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/drivers/net/smsc911x.c b/drivers/net/smsc911x.c
index ccdd196..6a9f51d 100644
--- a/drivers/net/smsc911x.c
+++ b/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/include/linux/smsc911x.h b/include/linux/smsc911x.h
index 5241e4f..7144e8a 100644
--- a/include/linux/smsc911x.h
+++ b/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 */
-- 
1.6.5.rc2

Re: [PATCH 2/2] net: smsc911x: allow platform_data to specify mac address

[David Miller]

From: Manuel Lauss <manuel.lauss@googlemail.com>
Date: Tue, 13 Oct 2009 19:25:49 +0200

> Extend the driver to accept a MAC address specified in platform_data.
> 
> Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com>

Applied.

Re: [PATCH 1/2] net: enable smsc911x on MIPS

[David Miller]

From: Manuel Lauss <manuel.lauss@googlemail.com>
Date: Tue, 13 Oct 2009 19:25:48 +0200

> Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com>

Applied.

Re: [PATCH 1/2] net: enable smsc911x on MIPS

[Steve.Glendinning]

> Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com>

Acked-by: Steve Glendinning <steve.glendinning@smsc.com>