diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2017-01-29 14:29:28 -0500 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2017-01-29 14:29:28 -0500 |
| commit | 443b494d850bdd1bf8b062049ff7eb73cfc0daae (patch) | |
| tree | 8c94e5e39ae674f416afad8bf5af555615e18fa1 /kernels/linux-libre-knock/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch | |
| parent | 4c1a4511ebbf945b1e7f6d324c6987f35d613e56 (diff) | |
| parent | 6303f3dfaf3e27308484ef4c44346e1b4695f863 (diff) | |
| download | abslibre-443b494d850bdd1bf8b062049ff7eb73cfc0daae.tar.gz abslibre-443b494d850bdd1bf8b062049ff7eb73cfc0daae.tar.bz2 abslibre-443b494d850bdd1bf8b062049ff7eb73cfc0daae.zip | |
Merge branch 'master' of git://projects.parabola.nu/abslibre/abslibre
Diffstat (limited to 'kernels/linux-libre-knock/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch')
| -rw-r--r-- | kernels/linux-libre-knock/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/kernels/linux-libre-knock/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch b/kernels/linux-libre-knock/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch index e89e6388e..09b889f59 100644 --- a/kernels/linux-libre-knock/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch +++ b/kernels/linux-libre-knock/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch @@ -1,15 +1,14 @@ -From a6b9bd0029d9453d4f59bc367f9a33e1a3285709 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 05/13] 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 dc989a8..912be75 100644 +index 831aa33..0362554 100644 --- a/drivers/net/usb/smsc95xx.c +++ b/drivers/net/usb/smsc95xx.c @@ -60,6 +60,7 @@ @@ -20,7 +19,7 @@ index dc989a8..912be75 100644 #define CARRIER_CHECK_DELAY (2 * HZ) -@@ -80,6 +81,10 @@ static bool turbo_mode = true; +@@ -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"); @@ -31,7 +30,7 @@ index dc989a8..912be75 100644 static int __must_check __smsc95xx_read_reg(struct usbnet *dev, u32 index, u32 *data, int in_pm) { -@@ -809,8 +814,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); } @@ -92,5 +91,5 @@ index dc989a8..912be75 100644 /* maybe the boot loader passed the MAC address in devicetree */ -- -2.10.2 +2.10.0 |