summaryrefslogtreecommitdiff
path: root/libre-testing/linux-libre/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
diff options
context:
space:
mode:
Diffstat (limited to 'libre-testing/linux-libre/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch')
-rw-r--r--libre-testing/linux-libre/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch11
1 files changed, 5 insertions, 6 deletions
diff --git a/libre-testing/linux-libre/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch b/libre-testing/linux-libre/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
index fbbde259a..18e2a7875 100644
--- a/libre-testing/linux-libre/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
+++ b/libre-testing/linux-libre/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
@@ -1,15 +1,14 @@
-From 021b0a93050b75f56690bbe41fc470c77f7573c0 Mon Sep 17 00:00:00 2001
+From 6e0372c8fec9db69e88a19c3a70a4c3a730fd743 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Tue, 18 Feb 2014 01:43:50 -0300
-Subject: [PATCH 05/14] net/smsc95xx: Allow mac address to be set as a
- parameter
+Subject: [PATCH 5/9] net/smsc95xx: Allow mac address to be set as a parameter
---
drivers/net/usb/smsc95xx.c | 56 ++++++++++++++++++++++++++++++++++++++
1 file changed, 56 insertions(+)
diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
-index 06b4d290784d..3be3b5a4a176 100644
+index 262e7a3c23cb..c2b3c5b6e1f3 100644
--- a/drivers/net/usb/smsc95xx.c
+++ b/drivers/net/usb/smsc95xx.c
@@ -60,6 +60,7 @@
@@ -31,7 +30,7 @@ index 06b4d290784d..3be3b5a4a176 100644
static int __must_check __smsc95xx_read_reg(struct usbnet *dev, u32 index,
u32 *data, int in_pm)
{
-@@ -910,8 +915,59 @@ static int smsc95xx_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd)
+@@ -913,8 +918,59 @@ static int smsc95xx_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd)
return generic_mii_ioctl(&dev->mii, if_mii(rq), cmd, NULL);
}
@@ -92,5 +91,5 @@ index 06b4d290784d..3be3b5a4a176 100644
/* maybe the boot loader passed the MAC address in devicetree */
--
-2.18.0
+2.19.0