diff options
author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-07-22 15:31:13 +0000 |
---|---|---|
committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-07-22 15:31:13 +0000 |
commit | ca415bb17643239f67221ece170d26e9682e61ff (patch) | |
tree | 4f0d9ddb998524a799908ecc74c5ba1e063d17c2 /target/linux/brcm2708/patches-3.10/006-Allow-mac-address-to-be-set-in-smsc95xx.patch | |
parent | b78c3a020aacc0711b30d53e07c6d8dc75168db4 (diff) |
kernel: update 3.10 to 3.10.2
Also refresh 3.10 patches.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37502 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm2708/patches-3.10/006-Allow-mac-address-to-be-set-in-smsc95xx.patch')
-rw-r--r-- | target/linux/brcm2708/patches-3.10/006-Allow-mac-address-to-be-set-in-smsc95xx.patch | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/target/linux/brcm2708/patches-3.10/006-Allow-mac-address-to-be-set-in-smsc95xx.patch b/target/linux/brcm2708/patches-3.10/006-Allow-mac-address-to-be-set-in-smsc95xx.patch index 5a243bba65..6760263038 100644 --- a/target/linux/brcm2708/patches-3.10/006-Allow-mac-address-to-be-set-in-smsc95xx.patch +++ b/target/linux/brcm2708/patches-3.10/006-Allow-mac-address-to-be-set-in-smsc95xx.patch @@ -1,6 +1,5 @@ -diff -urN linux-3.10/drivers/net/usb/smsc95xx.c linux-rpi-3.10.y/drivers/net/usb/smsc95xx.c ---- linux-3.10/drivers/net/usb/smsc95xx.c 2013-06-30 23:13:29.000000000 +0100 -+++ linux-rpi-3.10.y/drivers/net/usb/smsc95xx.c 2013-07-06 15:25:50.000000000 +0100 +--- a/drivers/net/usb/smsc95xx.c ++++ b/drivers/net/usb/smsc95xx.c @@ -61,6 +61,7 @@ #define SUSPEND_SUSPEND3 (0x08) #define SUSPEND_ALLMODES (SUSPEND_SUSPEND0 | SUSPEND_SUSPEND1 | \ @@ -9,7 +8,7 @@ diff -urN linux-3.10/drivers/net/usb/smsc95xx.c linux-rpi-3.10.y/drivers/net/usb struct smsc95xx_priv { u32 mac_cr; -@@ -76,6 +77,10 @@ +@@ -76,6 +77,10 @@ static bool turbo_mode = true; module_param(turbo_mode, bool, 0644); MODULE_PARM_DESC(turbo_mode, "Enable multiple frames per Rx transaction"); @@ -20,7 +19,7 @@ diff -urN linux-3.10/drivers/net/usb/smsc95xx.c linux-rpi-3.10.y/drivers/net/usb static int __must_check __smsc95xx_read_reg(struct usbnet *dev, u32 index, u32 *data, int in_pm) { -@@ -765,8 +770,59 @@ +@@ -765,8 +770,59 @@ static int smsc95xx_ioctl(struct net_dev return generic_mii_ioctl(&dev->mii, if_mii(rq), cmd, NULL); } |