summarylogtreecommitdiffstats
path: root/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
diff options
context:
space:
mode:
authorDaniel Bermond2019-09-28 16:07:05 +0000
committerDaniel Bermond2019-09-28 16:07:05 +0000
commit2a162ee16307e41f6de5e893085f23bff9279aae (patch)
treef53da15cd18b8296f4ed911eeea40f42dc5185d4 /0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
parent0d9f73572f9558c3e7ad87e525e015da765c39e6 (diff)
downloadaur-2a162ee16307e41f6de5e893085f23bff9279aae.tar.gz
Updated to version 5.3.1
Signed-off-by: Daniel Bermond <danielbermond@gmail.com>
Diffstat (limited to '0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch')
-rw-r--r--0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch14
1 files changed, 7 insertions, 7 deletions
diff --git a/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch b/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
index 29b694340fe4..b3b0bedc4a8d 100644
--- a/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
+++ b/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
@@ -1,17 +1,17 @@
-From 44feb9ee18a0a63523a1ac84a2122a91ab827f29 Mon Sep 17 00:00:00 2001
+From 244e51135d32faaa70f40a083be88bf8e6f184dd Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Tue, 18 Feb 2014 01:43:50 -0300
-Subject: [PATCH 5/8] 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 e3d08626828e..2eaae00b4033 100644
+index 355be77f4241..c94a7193e0b9 100644
--- a/drivers/net/usb/smsc95xx.c
+++ b/drivers/net/usb/smsc95xx.c
-@@ -60,6 +60,7 @@
+@@ -48,6 +48,7 @@
#define SUSPEND_SUSPEND3 (0x08)
#define SUSPEND_ALLMODES (SUSPEND_SUSPEND0 | SUSPEND_SUSPEND1 | \
SUSPEND_SUSPEND2 | SUSPEND_SUSPEND3)
@@ -19,7 +19,7 @@ index e3d08626828e..2eaae00b4033 100644
#define CARRIER_CHECK_DELAY (2 * HZ)
-@@ -82,6 +83,10 @@ static bool turbo_mode = true;
+@@ -70,6 +71,10 @@ static bool turbo_mode = true;
module_param(turbo_mode, bool, 0644);
MODULE_PARM_DESC(turbo_mode, "Enable multiple frames per Rx transaction");
@@ -30,7 +30,7 @@ index e3d08626828e..2eaae00b4033 100644
static int __must_check __smsc95xx_read_reg(struct usbnet *dev, u32 index,
u32 *data, int in_pm)
{
-@@ -911,8 +916,59 @@ static int smsc95xx_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd)
+@@ -899,8 +904,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);
}
@@ -91,5 +91,5 @@ index e3d08626828e..2eaae00b4033 100644
/* maybe the boot loader passed the MAC address in devicetree */
--
-2.20.1
+2.22.0