summarylogtreecommitdiffstats
path: root/0001-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
diff options
context:
space:
mode:
Diffstat (limited to '0001-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch')
-rw-r--r--0001-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch11
1 files changed, 5 insertions, 6 deletions
diff --git a/0001-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch b/0001-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
index e0cb8e4497cd..d99ffeeeb6d3 100644
--- a/0001-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
+++ b/0001-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
@@ -1,4 +1,4 @@
-From 89d947a0151b40ba6855d9a9e64ebd466cd64064 Mon Sep 17 00:00:00 2001
+From 648bf1e655cc1a82a32b1b556b2ecbdb03ab3a72 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Tue, 18 Feb 2014 01:43:50 -0300
Subject: [PATCH 1/2] net/smsc95xx: Allow mac address to be set as a parameter
@@ -8,7 +8,7 @@ Subject: [PATCH 1/2] net/smsc95xx: Allow mac address to be set as a parameter
1 file changed, 56 insertions(+)
diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
-index 4dc43929e370..75e8736e3a73 100644
+index bfb58c91db04..29b7c4cb90f1 100644
--- a/drivers/net/usb/smsc95xx.c
+++ b/drivers/net/usb/smsc95xx.c
@@ -54,6 +54,7 @@
@@ -27,10 +27,10 @@ index 4dc43929e370..75e8736e3a73 100644
+module_param(macaddr, charp, 0);
+MODULE_PARM_DESC(macaddr, "MAC address");
+
- static int __must_check __smsc95xx_read_reg(struct usbnet *dev, u32 index,
- u32 *data, int in_pm)
+ static int __must_check smsc95xx_read_reg(struct usbnet *dev, u32 index,
+ u32 *data)
{
-@@ -805,8 +810,59 @@ static int smsc95xx_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd)
+@@ -761,8 +766,59 @@ static int smsc95xx_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd)
return phy_mii_ioctl(netdev->phydev, rq, cmd);
}
@@ -92,4 +92,3 @@ index 4dc43929e370..75e8736e3a73 100644
/* maybe the boot loader passed the MAC address in devicetree */
--
2.37.0
-