diff options
author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2016-08-20 09:05:09 -0300 |
---|---|---|
committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2016-08-20 09:09:25 -0300 |
commit | d093ef08c8671806cabd4502af46931f91593cbd (patch) | |
tree | e5145fb078a9687ffdf48794d9f7c278da8bebd9 /kernels/linux-libre-grsec-xen/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch | |
parent | 2d5893c0bec35b458411a04fafbe3072e76c04dc (diff) |
linux-libre-grsec-xen-4.7.1_gnu.201608161813-1: updating version
Diffstat (limited to 'kernels/linux-libre-grsec-xen/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch')
-rw-r--r-- | kernels/linux-libre-grsec-xen/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/kernels/linux-libre-grsec-xen/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch b/kernels/linux-libre-grsec-xen/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch index 03fdd191c..276209970 100644 --- a/kernels/linux-libre-grsec-xen/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch +++ b/kernels/linux-libre-grsec-xen/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch @@ -1,14 +1,15 @@ -From 573ed812140e4319d2333206679e55a2f03ae632 Mon Sep 17 00:00:00 2001 +From b1895aa6ffd623abdb4595fe0c9e6bb815599290 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 05/10] 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 2edc2bc..2445b56 100644 +index dc989a8..912be75 100644 --- a/drivers/net/usb/smsc95xx.c +++ b/drivers/net/usb/smsc95xx.c @@ -60,6 +60,7 @@ @@ -17,9 +18,9 @@ index 2edc2bc..2445b56 100644 SUSPEND_SUSPEND2 | SUSPEND_SUSPEND3) +#define MAC_ADDR_LEN (6) - struct smsc95xx_priv { - u32 mac_cr; -@@ -75,6 +76,10 @@ static bool turbo_mode = true; + #define CARRIER_CHECK_DELAY (2 * HZ) + +@@ -80,6 +81,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 +31,7 @@ index 2edc2bc..2445b56 100644 static int __must_check __smsc95xx_read_reg(struct usbnet *dev, u32 index, u32 *data, int in_pm) { -@@ -764,8 +769,59 @@ static int smsc95xx_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd) +@@ -809,8 +814,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 +92,5 @@ index 2edc2bc..2445b56 100644 /* maybe the boot loader passed the MAC address in devicetree */ -- -2.8.2 +2.9.2 |