diff options
| author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2017-03-14 23:50:17 -0300 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2017-03-14 23:50:17 -0300 |
| commit | 273ba00fa2f4adbbee41352e0b22877c1c4facd2 (patch) | |
| tree | dfe14f0830d4002fe06d01bed6e39530e8569f7e /kernels/linux-libre-lts-knock/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch | |
| parent | 4be6def67737299ff00f49b0eacf50fbcda6e378 (diff) | |
| download | abslibre-273ba00fa2f4adbbee41352e0b22877c1c4facd2.tar.gz abslibre-273ba00fa2f4adbbee41352e0b22877c1c4facd2.tar.bz2 abslibre-273ba00fa2f4adbbee41352e0b22877c1c4facd2.zip | |
linux-libre-lts-knock-4.9.14_gnu-1: updating version
Diffstat (limited to 'kernels/linux-libre-lts-knock/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch')
| -rw-r--r-- | kernels/linux-libre-lts-knock/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/kernels/linux-libre-lts-knock/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch b/kernels/linux-libre-lts-knock/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch index 6ab41a175..09b889f59 100644 --- a/kernels/linux-libre-lts-knock/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch +++ b/kernels/linux-libre-lts-knock/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch @@ -1,25 +1,25 @@ -From dad3e39a200b3f91e5e4790fe95cdbfc27a18673 Mon Sep 17 00:00:00 2001 +From f0e29c8c8744317cfe946faf4f4ebae76f2c4eb1 Mon Sep 17 00:00:00 2001 From: popcornmix <popcornmix@gmail.com> Date: Tue, 18 Feb 2014 01:43:50 -0300 -Subject: [PATCH 5/9] net/smsc95xx: Allow mac address to be set as a parameter +Subject: [PATCH 5/8] 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 26423ad..e29a323 100644 +index 831aa33..0362554 100644 --- a/drivers/net/usb/smsc95xx.c +++ b/drivers/net/usb/smsc95xx.c -@@ -59,6 +59,7 @@ +@@ -60,6 +60,7 @@ #define SUSPEND_SUSPEND3 (0x08) #define SUSPEND_ALLMODES (SUSPEND_SUSPEND0 | SUSPEND_SUSPEND1 | \ SUSPEND_SUSPEND2 | SUSPEND_SUSPEND3) +#define MAC_ADDR_LEN (6) - struct smsc95xx_priv { - u32 mac_cr; -@@ -74,6 +75,10 @@ static bool turbo_mode = true; + #define CARRIER_CHECK_DELAY (2 * HZ) + +@@ -82,6 +83,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 26423ad..e29a323 100644 static int __must_check __smsc95xx_read_reg(struct usbnet *dev, u32 index, u32 *data, int in_pm) { -@@ -763,8 +768,59 @@ static int smsc95xx_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd) +@@ -910,8 +915,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); } @@ -87,9 +87,9 @@ index 26423ad..e29a323 100644 + if (smsc95xx_is_macaddr_param(dev, dev->net->dev_addr)) + return; + - /* try reading mac address from EEPROM */ - if (smsc95xx_read_eeprom(dev, EEPROM_MAC_OFFSET, ETH_ALEN, - dev->net->dev_addr) == 0) { + const u8 *mac_addr; + + /* maybe the boot loader passed the MAC address in devicetree */ -- -2.6.4 +2.10.0 |