diff options
| author | André Fabian Silva Delgado | 2016-05-18 11:21:58 -0300 |
|---|---|---|
| committer | André Fabian Silva Delgado | 2016-05-18 11:21:58 -0300 |
| commit | 75d063ee8ff7183fd0f496a4782fdf5f65c097a8 (patch) | |
| tree | 9efb6c09d56259cbf447d4b68ff0dad69fb63e44 /0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch | |
| parent | b65ab1da4d98f405df461279623d5d46197c8012 (diff) | |
| download | aur-75d063ee8ff7183fd0f496a4782fdf5f65c097a8.tar.gz | |
Update to 4.6_gnu-1
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.patch | 21 |
1 files changed, 10 insertions, 11 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 3ab74540ae93..03fdd191c0a0 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,18 +1,17 @@ -From 75f7a861ec5a0f19d2724be0327914b658aec00c Mon Sep 17 00:00:00 2001 +From 573ed812140e4319d2333206679e55a2f03ae632 Mon Sep 17 00:00:00 2001 From: popcornmix <popcornmix@gmail.com> Date: Tue, 18 Feb 2014 01:43:50 -0300 -Subject: [PATCH 05/10] 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 66b3ab9..3cc50f6 100644 +index 2edc2bc..2445b56 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) @@ -20,7 +19,7 @@ index 66b3ab9..3cc50f6 100644 struct smsc95xx_priv { u32 mac_cr; -@@ -74,6 +75,10 @@ static bool turbo_mode = true; +@@ -75,6 +76,10 @@ static bool turbo_mode = true; module_param(turbo_mode, bool, 0644); MODULE_PARM_DESC(turbo_mode, "Enable multiple frames per Rx transaction"); @@ -31,7 +30,7 @@ index 66b3ab9..3cc50f6 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) +@@ -764,8 +769,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); } @@ -88,9 +87,9 @@ index 66b3ab9..3cc50f6 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.7.3 +2.8.2 |