diff options
Diffstat (limited to 'target')
42 files changed, 159 insertions, 374 deletions
diff --git a/target/linux/ar7/Makefile b/target/linux/ar7/Makefile index 8601dd0..74321a2 100644 --- a/target/linux/ar7/Makefile +++ b/target/linux/ar7/Makefile @@ -13,7 +13,7 @@ FEATURES:=squashfs atm MAINTAINER:=Florian Fainelli <florian@openwrt.org> SUBTARGETS:=generic ac49x -LINUX_VERSION:=3.10.15 +LINUX_VERSION:=3.10.17 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ar71xx/Makefile b/target/linux/ar71xx/Makefile index 0c99c08..d7d4f4e 100644 --- a/target/linux/ar71xx/Makefile +++ b/target/linux/ar71xx/Makefile @@ -13,7 +13,7 @@ FEATURES:=squashfs targz mips16 CPU_TYPE=34kc SUBTARGETS:=generic nand -LINUX_VERSION:=3.10.15 +LINUX_VERSION:=3.10.17 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ar71xx/patches-3.10/902-unaligned_access_hacks.patch b/target/linux/ar71xx/patches-3.10/902-unaligned_access_hacks.patch index fa4ff47..ce55abd 100644 --- a/target/linux/ar71xx/patches-3.10/902-unaligned_access_hacks.patch +++ b/target/linux/ar71xx/patches-3.10/902-unaligned_access_hacks.patch @@ -342,7 +342,7 @@ --- a/net/ipv6/exthdrs.c +++ b/net/ipv6/exthdrs.c -@@ -579,7 +579,7 @@ static bool ipv6_hop_jumbo(struct sk_buf +@@ -573,7 +573,7 @@ static bool ipv6_hop_jumbo(struct sk_buf goto drop; } @@ -367,7 +367,7 @@ #endif /* _LINUX_TYPES_H */ --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c -@@ -1383,8 +1383,8 @@ static struct sk_buff **inet_gro_receive +@@ -1381,8 +1381,8 @@ static struct sk_buff **inet_gro_receive if (unlikely(ip_fast_csum((u8 *)iph, 5))) goto out_unlock; @@ -558,8 +558,8 @@ --- a/net/core/flow_dissector.c +++ b/net/core/flow_dissector.c @@ -152,7 +152,7 @@ ipv6: - nhoff += poff; - ports = skb_header_pointer(skb, nhoff, sizeof(_ports), &_ports); + ports = skb_header_pointer(skb, nhoff + poff, + sizeof(_ports), &_ports); if (ports) - flow->ports = *ports; + flow->ports = net_hdr_word(ports); @@ -760,8 +760,8 @@ #include <linux/types.h> +#include <linux/in6.h> - extern void net_secret_init(void); extern __u32 secure_ip_id(__be32 daddr); + extern __u32 secure_ipv6_id(const __be32 daddr[4]); --- a/include/uapi/linux/in.h +++ b/include/uapi/linux/in.h @@ -55,7 +55,7 @@ enum { @@ -775,12 +775,13 @@ #define IP_TTL 2 --- a/net/core/secure_seq.c +++ b/net/core/secure_seq.c -@@ -41,10 +41,11 @@ __u32 secure_tcpv6_sequence_number(const +@@ -54,11 +54,12 @@ __u32 secure_tcpv6_sequence_number(const u32 secret[MD5_MESSAGE_BYTES / 4]; u32 hash[MD5_DIGEST_WORDS]; u32 i; + const struct in6_addr *daddr6 = (struct in6_addr *) daddr; + net_secret_init(); memcpy(hash, saddr, 16); for (i = 0; i < 4; i++) - secret[i] = net_secret[i] + (__force u32)daddr[i]; @@ -788,12 +789,13 @@ secret[4] = net_secret[4] + (((__force u16)sport << 16) + (__force u16)dport); for (i = 5; i < MD5_MESSAGE_BYTES / 4; i++) -@@ -62,10 +63,11 @@ u32 secure_ipv6_port_ephemeral(const __b +@@ -76,11 +77,12 @@ u32 secure_ipv6_port_ephemeral(const __b u32 secret[MD5_MESSAGE_BYTES / 4]; u32 hash[MD5_DIGEST_WORDS]; u32 i; + const struct in6_addr *daddr6 = (struct in6_addr *) daddr; + net_secret_init(); memcpy(hash, saddr, 16); for (i = 0; i < 4; i++) - secret[i] = net_secret[i] + (__force u32) daddr[i]; @@ -801,12 +803,13 @@ secret[4] = net_secret[4] + (__force u32)dport; for (i = 5; i < MD5_MESSAGE_BYTES / 4; i++) secret[i] = net_secret[i]; -@@ -163,10 +165,11 @@ u64 secure_dccpv6_sequence_number(__be32 +@@ -183,11 +185,12 @@ u64 secure_dccpv6_sequence_number(__be32 u32 hash[MD5_DIGEST_WORDS]; u64 seq; u32 i; + const struct in6_addr *daddr6 = (struct in6_addr *) daddr; + net_secret_init(); memcpy(hash, saddr, 16); for (i = 0; i < 4; i++) - secret[i] = net_secret[i] + daddr[i]; diff --git a/target/linux/atheros/patches-3.10/230-3_10-updates.patch b/target/linux/atheros/patches-3.10/230-3_10-updates.patch index 8428128..a83bdcd 100644 --- a/target/linux/atheros/patches-3.10/230-3_10-updates.patch +++ b/target/linux/atheros/patches-3.10/230-3_10-updates.patch @@ -9,26 +9,3 @@ PHY_INTERFACE_MODE_MII); if (IS_ERR(phydev)) { ---- a/drivers/net/phy/mvswitch.c -+++ b/drivers/net/phy/mvswitch.c -@@ -173,7 +173,7 @@ mvswitch_mangle_rx(struct net_device *de - if (vlan == -1) - return; - -- __vlan_hwaccel_put_tag(skb, vlan); -+ __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vlan); - } - - -@@ -307,9 +307,9 @@ mvswitch_config_init(struct phy_device * - - #ifdef HEADER_MODE - dev->priv_flags |= IFF_NO_IP_ALIGN; -- dev->features |= NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_TX; -+ dev->features |= NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_HW_VLAN_CTAG_TX; - #else -- dev->features |= NETIF_F_HW_VLAN_RX; -+ dev->features |= NETIF_F_HW_VLAN_CTAG_RX; - #endif - - return 0; diff --git a/target/linux/avr32/Makefile b/target/linux/avr32/Makefile index 8992c43..fad8292 100644 --- a/target/linux/avr32/Makefile +++ b/target/linux/avr32/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=Atmel AVR32 FEATURES:=squashfs MAINTAINER:=Imre Kaloz <kaloz@openwrt.org> -LINUX_VERSION:=3.10.15 +LINUX_VERSION:=3.10.17 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/avr32/patches-3.10/100-avr32-balance-cpu_idle_poll_ctrl-calls.patch b/target/linux/avr32/patches-3.10/100-avr32-balance-cpu_idle_poll_ctrl-calls.patch deleted file mode 100644 index 15918d6..0000000 --- a/target/linux/avr32/patches-3.10/100-avr32-balance-cpu_idle_poll_ctrl-calls.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 1b2bdd19742d4a336a4865d9b352c7a0ca7028ee Mon Sep 17 00:00:00 2001 -From: Gabor Juhos <juhosg@openwrt.org> -Date: Wed, 25 Sep 2013 10:00:10 +0200 -Subject: [PATCH] avr32: balance cpu_idle_poll_ctrl calls - -Since commit 01426478df3a8791ff5c8b6b82d409e699cfaf38 -(avr32: Use generic idle loop) the kernel throws the -following warning on avr32: - - WARNING: at 900322e4 [verbose debug info unavailable] - Modules linked in: - CPU: 0 PID: 0 Comm: swapper Not tainted 3.12.0-rc2 #117 - task: 901c3ecc ti: 901c0000 task.ti: 901c0000 - PC is at cpu_idle_poll_ctrl+0x1c/0x38 - LR is at comparator_mode+0x3e/0x40 - pc : [<900322e4>] lr : [<90014882>] Not tainted - sp : 901c1f74 r12: 00000000 r11: 901c74a0 - r10: 901d2510 r9 : 00000001 r8 : 901db4de - r7 : 901c74a0 r6 : 00000001 r5 : 00410020 r4 : 901db574 - r3 : 00410024 r2 : 90206fe0 r1 : 00000000 r0 : 007f0000 - Flags: qvnzc - Mode bits: hjmde....G - CPU Mode: Supervisor - Call trace: - [<90039ede>] clockevents_set_mode+0x16/0x2e - [<90039f00>] clockevents_shutdown+0xa/0x1e - [<9003a078>] clockevents_exchange_device+0x58/0x70 - [<9003a78c>] tick_check_new_device+0x38/0x54 - [<9003a1a2>] clockevents_register_device+0x32/0x90 - [<900035c4>] time_init+0xa8/0x108 - [<90000520>] start_kernel+0x128/0x23c - -When the 'avr32_comparator' clockevent device is registered, -the clockevent core sets the mode of that clockevent device -to CLOCK_EVT_MODE_SHUTDOWN. Due to this, the 'comparator_mode' -function calls the 'cpu_idle_poll_ctrl' to disables idle poll. -This results in the aforementioned warning because the polling -is not enabled yet. - -Change the code to only disable idle poll if it is enabled by -the same function to avoid the warning. - -Cc: stable@vger.kernel.org -Signed-off-by: Gabor Juhos <juhosg@openwrt.org> ---- -Note: the patch is against v3.12-rc2. ---- - arch/avr32/kernel/time.c | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - ---- a/arch/avr32/kernel/time.c -+++ b/arch/avr32/kernel/time.c -@@ -98,7 +98,14 @@ static void comparator_mode(enum clock_e - case CLOCK_EVT_MODE_SHUTDOWN: - sysreg_write(COMPARE, 0); - pr_debug("%s: stop\n", evdev->name); -- cpu_idle_poll_ctrl(false); -+ if (evdev->mode == CLOCK_EVT_MODE_ONESHOT || -+ evdev->mode == CLOCK_EVT_MODE_RESUME) { -+ /* -+ * Only disable idle poll if we have forced that -+ * in a previous call. -+ */ -+ cpu_idle_poll_ctrl(false); -+ } - break; - default: - BUG(); diff --git a/target/linux/bcm53xx/Makefile b/target/linux/bcm53xx/Makefile index 4ebacd0..f1cd5a8 100644 --- a/target/linux/bcm53xx/Makefile +++ b/target/linux/bcm53xx/Makefile @@ -14,7 +14,7 @@ MAINTAINER:=Hauke Mehrtens <hauke@hauke-m.de> CPU_TYPE:=cortex-a9 CPU_SUBTYPE:=vfp -LINUX_VERSION:=3.10.15 +LINUX_VERSION:=3.10.17 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/brcm2708/Makefile b/target/linux/brcm2708/Makefile index d652184..57d5af6 100644 --- a/target/linux/brcm2708/Makefile +++ b/target/linux/brcm2708/Makefile @@ -15,7 +15,7 @@ MAINTAINER:=Florian Fainelli <florian@openwrt.org> CPU_TYPE:=arm1176jzf-s CPU_SUBTYPE:=vfp -LINUX_VERSION:=3.10.15 +LINUX_VERSION:=3.10.17 include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += brcm2708-gpu-fw kmod-usb-hid kmod-sound-core kmod-sound-arm-bcm2835 diff --git a/target/linux/brcm47xx/Makefile b/target/linux/brcm47xx/Makefile index f955622..09fd152 100644 --- a/target/linux/brcm47xx/Makefile +++ b/target/linux/brcm47xx/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=Broadcom BCM947xx/953xx FEATURES:=squashfs usb pcmcia MAINTAINER:=Hauke Mehrtens <hauke@hauke-m.de> -LINUX_VERSION:=3.10.15 +LINUX_VERSION:=3.10.17 include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += swconfig kmod-diag wpad-mini nvram diff --git a/target/linux/brcm63xx/Makefile b/target/linux/brcm63xx/Makefile index 1fb2edf..34b608b 100644 --- a/target/linux/brcm63xx/Makefile +++ b/target/linux/brcm63xx/Makefile @@ -11,7 +11,7 @@ BOARD:=brcm63xx BOARDNAME:=Broadcom BCM63xx SUBTARGETS:=generic smp FEATURES:=squashfs usb atm pci pcmcia -LINUX_VERSION:=3.10.15 +LINUX_VERSION:=3.10.17 MAINTAINER:=Florian Fainelli <florian@openwrt.org> include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/cns21xx/Makefile b/target/linux/cns21xx/Makefile index f010d5a..0903272 100644 --- a/target/linux/cns21xx/Makefile +++ b/target/linux/cns21xx/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=Cavium Networks Econa CNS21xx FEATURES:=squashfs CPU_TYPE:=fa526 -LINUX_VERSION:=3.10.15 +LINUX_VERSION:=3.10.17 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/cns21xx/patches-3.10/103-cns21xx-usb-ohci-support.patch b/target/linux/cns21xx/patches-3.10/103-cns21xx-usb-ohci-support.patch index a1b2d82..db4feca 100644 --- a/target/linux/cns21xx/patches-3.10/103-cns21xx-usb-ohci-support.patch +++ b/target/linux/cns21xx/patches-3.10/103-cns21xx-usb-ohci-support.patch @@ -1,6 +1,6 @@ --- a/drivers/usb/host/ohci-hcd.c +++ b/drivers/usb/host/ohci-hcd.c -@@ -695,6 +695,9 @@ retry: +@@ -697,6 +697,9 @@ retry: periodic_reinit (ohci); @@ -10,7 +10,7 @@ /* some OHCI implementations are finicky about how they init. * bogus values here mean not even enumeration could work. */ -@@ -1189,6 +1192,11 @@ MODULE_LICENSE ("GPL"); +@@ -1191,6 +1194,11 @@ MODULE_LICENSE ("GPL"); #define PLATFORM_DRIVER ohci_hcd_tilegx_driver #endif @@ -22,7 +22,7 @@ #ifdef CONFIG_USB_OHCI_HCD_PLATFORM #include "ohci-platform.c" #define PLATFORM_DRIVER ohci_platform_driver -@@ -1209,7 +1217,8 @@ MODULE_LICENSE ("GPL"); +@@ -1211,7 +1219,8 @@ MODULE_LICENSE ("GPL"); !defined(AT91_PLATFORM_DRIVER) && \ !defined(NXP_PLATFORM_DRIVER) && \ !defined(DAVINCI_PLATFORM_DRIVER) && \ @@ -32,7 +32,7 @@ #error "missing bus glue for ohci-hcd" #endif -@@ -1329,9 +1338,19 @@ static int __init ohci_hcd_mod_init(void +@@ -1331,9 +1340,19 @@ static int __init ohci_hcd_mod_init(void goto error_spear; #endif @@ -52,7 +52,7 @@ #ifdef SPEAR_PLATFORM_DRIVER platform_driver_unregister(&SPEAR_PLATFORM_DRIVER); error_spear: -@@ -1409,6 +1428,9 @@ module_init(ohci_hcd_mod_init); +@@ -1411,6 +1430,9 @@ module_init(ohci_hcd_mod_init); static void __exit ohci_hcd_mod_exit(void) { diff --git a/target/linux/generic/patches-3.10/110-net_fix_multiqueue_selection.patch b/target/linux/generic/patches-3.10/110-net_fix_multiqueue_selection.patch deleted file mode 100644 index 6a07ee8..0000000 --- a/target/linux/generic/patches-3.10/110-net_fix_multiqueue_selection.patch +++ /dev/null @@ -1,41 +0,0 @@ -From: Eric Dumazet <edumazet@google.com> - -commit 416186fbf8c5b4e4465 ("net: Split core bits of netdev_pick_tx -into __netdev_pick_tx") added a bug that disables caching of queue -index in the socket. - -This is the source of packet reorders for TCP flows, and -again this is happening more often when using FQ pacing. - -Old code was doing - -if (queue_index != old_index) - sk_tx_queue_set(sk, queue_index); - -Alexander renamed the variables but forgot to change sk_tx_queue_set() -2nd parameter. - -if (queue_index != new_index) - sk_tx_queue_set(sk, queue_index); - -This means we store -1 over and over in sk->sk_tx_queue_mapping - -Signed-off-by: Eric Dumazet <edumazet@google.com> -Cc: Alexander Duyck <alexander.h.duyck@intel.com> -Acked-by: Alexander Duyck <alexander.h.duyck@intel.com> - ---- -net/core/flow_dissector.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/net/core/flow_dissector.c -+++ b/net/core/flow_dissector.c -@@ -347,7 +347,7 @@ u16 __netdev_pick_tx(struct net_device * - - if (queue_index != new_index && sk && - rcu_access_pointer(sk->sk_dst_cache)) -- sk_tx_queue_set(sk, queue_index); -+ sk_tx_queue_set(sk, new_index); - - queue_index = new_index; - } diff --git a/target/linux/generic/patches-3.10/643-bridge_remove_ipv6_dependency.patch b/target/linux/generic/patches-3.10/643-bridge_remove_ipv6_dependency.patch index 010c604..4e34d51 100644 --- a/target/linux/generic/patches-3.10/643-bridge_remove_ipv6_dependency.patch +++ b/target/linux/generic/patches-3.10/643-bridge_remove_ipv6_dependency.patch @@ -1,6 +1,6 @@ --- a/include/net/addrconf.h +++ b/include/net/addrconf.h -@@ -99,6 +99,12 @@ extern void addrconf_join_solict(struc +@@ -103,6 +103,12 @@ extern void addrconf_join_solict(struc extern void addrconf_leave_solict(struct inet6_dev *idev, const struct in6_addr *addr); @@ -49,7 +49,7 @@ int __ipv6_get_lladdr(struct inet6_dev *idev, struct in6_addr *addr, unsigned char banned_flags) -@@ -5143,6 +5142,9 @@ int __init addrconf_init(void) +@@ -5170,6 +5169,9 @@ int __init addrconf_init(void) ipv6_addr_label_rtnl_register(); @@ -59,7 +59,7 @@ return 0; errout: rtnl_af_unregister(&inet6_ops); -@@ -5161,6 +5163,9 @@ void addrconf_cleanup(void) +@@ -5188,6 +5190,9 @@ void addrconf_cleanup(void) struct net_device *dev; int i; diff --git a/target/linux/generic/patches-3.10/644-bridge_optimize_netfilter_hooks.patch b/target/linux/generic/patches-3.10/644-bridge_optimize_netfilter_hooks.patch index 5b5dba5..ac41cf5 100644 --- a/target/linux/generic/patches-3.10/644-bridge_optimize_netfilter_hooks.patch +++ b/target/linux/generic/patches-3.10/644-bridge_optimize_netfilter_hooks.patch @@ -96,7 +96,7 @@ if (vlan_tx_tag_present(skb)) --- a/net/bridge/br_private.h +++ b/net/bridge/br_private.h -@@ -699,15 +699,29 @@ static inline u16 br_get_pvid(const stru +@@ -696,15 +696,29 @@ static inline u16 br_get_pvid(const stru /* br_netfilter.c */ #ifdef CONFIG_BRIDGE_NETFILTER diff --git a/target/linux/generic/patches-3.10/902-debloat_proc.patch b/target/linux/generic/patches-3.10/902-debloat_proc.patch index 907e046..d3d6aaa 100644 --- a/target/linux/generic/patches-3.10/902-debloat_proc.patch +++ b/target/linux/generic/patches-3.10/902-debloat_proc.patch @@ -251,7 +251,7 @@ --- a/ipc/msg.c +++ b/ipc/msg.c -@@ -136,6 +136,9 @@ void __init msg_init(void) +@@ -134,6 +134,9 @@ void __init msg_init(void) printk(KERN_INFO "msgmni has been set to %d\n", init_ipc_ns.msg_ctlmni); @@ -263,7 +263,7 @@ IPC_MSG_IDS, sysvipc_msg_proc_show); --- a/ipc/sem.c +++ b/ipc/sem.c -@@ -184,6 +184,8 @@ void sem_exit_ns(struct ipc_namespace *n +@@ -191,6 +191,8 @@ void sem_exit_ns(struct ipc_namespace *n void __init sem_init (void) { sem_init_ns(&init_ipc_ns); @@ -274,7 +274,7 @@ IPC_SEM_IDS, sysvipc_sem_proc_show); --- a/ipc/shm.c +++ b/ipc/shm.c -@@ -115,6 +115,8 @@ pure_initcall(ipc_ns_init); +@@ -118,6 +118,8 @@ pure_initcall(ipc_ns_init); void __init shm_init (void) { @@ -285,7 +285,7 @@ " key shmid perms size cpid lpid nattch uid gid cuid cgid atime dtime ctime rss swap\n", --- a/ipc/util.c +++ b/ipc/util.c -@@ -150,6 +150,9 @@ void __init ipc_init_proc_interface(cons +@@ -158,6 +158,9 @@ void __init ipc_init_proc_interface(cons struct proc_dir_entry *pde; struct ipc_proc_iface *iface; diff --git a/target/linux/generic/patches-3.10/921-use_preinit_as_init.patch b/target/linux/generic/patches-3.10/921-use_preinit_as_init.patch index 13f4a9a..3eee3e8 100644 --- a/target/linux/generic/patches-3.10/921-use_preinit_as_init.patch +++ b/target/linux/generic/patches-3.10/921-use_preinit_as_init.patch @@ -1,6 +1,6 @@ --- a/init/main.c +++ b/init/main.c -@@ -838,7 +838,8 @@ static int __ref kernel_init(void *unuse +@@ -840,7 +840,8 @@ static int __ref kernel_init(void *unuse pr_err("Failed to execute %s. Attempting defaults...\n", execute_command); } diff --git a/target/linux/generic/patches-3.10/950-vm_exports.patch b/target/linux/generic/patches-3.10/950-vm_exports.patch index c19c332..0ec0623 100644 --- a/target/linux/generic/patches-3.10/950-vm_exports.patch +++ b/target/linux/generic/patches-3.10/950-vm_exports.patch @@ -1,7 +1,7 @@ --- a/mm/shmem.c +++ b/mm/shmem.c -@@ -2889,6 +2889,15 @@ static struct dentry_operations anon_ops - .d_dname = shmem_dname +@@ -2883,6 +2883,15 @@ static struct dentry_operations anon_ops + .d_dname = simple_dname }; +void shmem_set_file(struct vm_area_struct *vma, struct file *file) @@ -16,7 +16,7 @@ /** * shmem_file_setup - get an unlinked file living in tmpfs * @name: name for dentry (to be seen in /proc/<pid>/maps -@@ -2962,11 +2971,8 @@ int shmem_zero_setup(struct vm_area_stru +@@ -2956,11 +2965,8 @@ int shmem_zero_setup(struct vm_area_stru file = shmem_file_setup("dev/zero", size, vma->vm_flags); if (IS_ERR(file)) return PTR_ERR(file); diff --git a/target/linux/imx6/Makefile b/target/linux/imx6/Makefile index b5d0cef..ccff4dc 100644 --- a/target/linux/imx6/Makefile +++ b/target/linux/imx6/Makefile @@ -14,7 +14,7 @@ CPU_TYPE:=cortex-a9 CPU_SUBTYPE:=vfpv3 MAINTAINER:=Luka Perkov <luka@openwrt.org> -LINUX_VERSION:=3.10.15 +LINUX_VERSION:=3.10.17 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ixp4xx/Makefile b/target/linux/ixp4xx/Makefile index 470f46f..cf18ef7 100644 --- a/target/linux/ixp4xx/Makefile +++ b/target/linux/ixp4xx/Makefile @@ -13,7 +13,7 @@ FEATURES:=squashfs MAINTAINER:=Imre Kaloz <kaloz@openwrt.org> SUBTARGETS=generic harddisk -LINUX_VERSION:=3.10.15 +LINUX_VERSION:=3.10.17 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/kirkwood/Makefile b/target/linux/kirkwood/Makefile index ba1d259..60af7a2 100644 --- a/target/linux/kirkwood/Makefile +++ b/target/linux/kirkwood/Makefile @@ -13,7 +13,7 @@ FEATURES:=targz usb jffs2_nand ubifs CPU_TYPE:=xscale MAINTAINER:=Imre Kaloz <kaloz@openwrt.org> -LINUX_VERSION:=3.10.15 +LINUX_VERSION:=3.10.17 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/lantiq/Makefile b/target/linux/lantiq/Makefile index 714c1a0..7b15754 100644 --- a/target/linux/lantiq/Makefile +++ b/target/linux/lantiq/Makefile @@ -11,7 +11,7 @@ BOARDNAME:=Lantiq GPON/XWAY/SVIP FEATURES:=squashfs SUBTARGETS=xway xrx200 ase falcon -LINUX_VERSION:=3.10.15 +LINUX_VERSION:=3.10.17 CPU_TYPE:=mips32r2 diff --git a/target/linux/lantiq/patches-3.10/0100-mtd-split.patch b/target/linux/lantiq/patches-3.10/0100-mtd-split.patch index f83600f..056f517 100644 --- a/target/linux/lantiq/patches-3.10/0100-mtd-split.patch +++ b/target/linux/lantiq/patches-3.10/0100-mtd-split.patch @@ -1,7 +1,5 @@ -Index: linux-3.10.13/arch/mips/lantiq/xway/Makefile -=================================================================== ---- linux-3.10.13.orig/arch/mips/lantiq/xway/Makefile 2013-10-01 00:07:55.165279437 +0200 -+++ linux-3.10.13/arch/mips/lantiq/xway/Makefile 2013-10-01 00:10:24.269285811 +0200 +--- a/arch/mips/lantiq/xway/Makefile ++++ b/arch/mips/lantiq/xway/Makefile @@ -1,6 +1,6 @@ obj-y := prom.o sysctrl.o clk.o reset.o dma.o gptu.o dcdc.o @@ -10,10 +8,8 @@ Index: linux-3.10.13/arch/mips/lantiq/xway/Makefile obj-$(CONFIG_PCI) += ath_eep.o rt_eep.o pci-ath-fixup.o -Index: linux-3.10.13/arch/mips/lantiq/xway/mtd_split.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.10.13/arch/mips/lantiq/xway/mtd_split.c 2013-10-01 00:11:28.745288566 +0200 +--- /dev/null ++++ b/arch/mips/lantiq/xway/mtd_split.c @@ -0,0 +1,129 @@ +#include <linux/magic.h> +#include <linux/root_dev.h> @@ -144,11 +140,9 @@ Index: linux-3.10.13/arch/mips/lantiq/xway/mtd_split.c + split_eva_kernel(master, name, offset, size); + split_brnimage_kernel(master, name, offset, size); +} -Index: linux-3.10.13/include/linux/mtd/partitions.h -=================================================================== ---- linux-3.10.13.orig/include/linux/mtd/partitions.h 2013-10-01 00:07:55.165279437 +0200 -+++ linux-3.10.13/include/linux/mtd/partitions.h 2013-10-01 00:08:03.889279810 +0200 -@@ -89,12 +89,17 @@ +--- a/include/linux/mtd/partitions.h ++++ b/include/linux/mtd/partitions.h +@@ -89,12 +89,17 @@ extern int deregister_mtd_parser(struct int mtd_is_partition(const struct mtd_info *mtd); int mtd_add_partition(struct mtd_info *master, char *name, long long offset, long long length); @@ -168,11 +162,9 @@ Index: linux-3.10.13/include/linux/mtd/partitions.h int parse_mtd_partitions_by_type(struct mtd_info *master, enum mtd_parser_type type, -Index: linux-3.10.13/drivers/mtd/mtdpart.c -=================================================================== ---- linux-3.10.13.orig/drivers/mtd/mtdpart.c 2013-10-01 00:07:55.165279437 +0200 -+++ linux-3.10.13/drivers/mtd/mtdpart.c 2013-10-01 00:08:03.893279810 +0200 -@@ -616,7 +616,7 @@ +--- a/drivers/mtd/mtdpart.c ++++ b/drivers/mtd/mtdpart.c +@@ -616,7 +616,7 @@ out_register: } @@ -181,7 +173,7 @@ Index: linux-3.10.13/drivers/mtd/mtdpart.c __mtd_add_partition(struct mtd_info *master, char *name, long long offset, long long length, bool dup_check) { -@@ -737,7 +737,7 @@ +@@ -737,7 +737,7 @@ run_parsers_by_type(struct mtd_part *sla return nr_parts; } @@ -190,7 +182,7 @@ Index: linux-3.10.13/drivers/mtd/mtdpart.c mtd_pad_erasesize(struct mtd_info *mtd, int offset, int len) { unsigned long mask = mtd->erasesize - 1; -@@ -806,7 +806,6 @@ +@@ -806,7 +806,6 @@ static void split_uimage(struct mtd_info return; len = be32_to_cpu(hdr.size) + 0x40; diff --git a/target/linux/malta/Makefile b/target/linux/malta/Makefile index 362069b..c24e1b7 100644 --- a/target/linux/malta/Makefile +++ b/target/linux/malta/Makefile @@ -12,7 +12,7 @@ SUBTARGETS:=le be le64 be64 INITRAMFS_EXTRA_FILES:= MAINTAINER:=Florian Fainelli <florian@openwrt.org> -LINUX_VERSION:=3.10.15 +LINUX_VERSION:=3.10.17 DEVICE_TYPE:=developerboard diff --git a/target/linux/mpc85xx/Makefile b/target/linux/mpc85xx/Makefile index c6d971d..1721e95 100644 --- a/target/linux/mpc85xx/Makefile +++ b/target/linux/mpc85xx/Makefile @@ -14,7 +14,7 @@ FEATURES:=spe_fpu squashfs MAINTAINER:=Imre Kaloz <kaloz@openwrt.org> SUBTARGETS=generic p1020 -LINUX_VERSION:=3.10.15 +LINUX_VERSION:=3.10.17 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/mpc85xx/patches-3.10/200-gianfar_napi_poll_revert.patch b/target/linux/mpc85xx/patches-3.10/200-gianfar_napi_poll_revert.patch index 9f2b727..7b0e6c9 100644 --- a/target/linux/mpc85xx/patches-3.10/200-gianfar_napi_poll_revert.patch +++ b/target/linux/mpc85xx/patches-3.10/200-gianfar_napi_poll_revert.patch @@ -1,6 +1,6 @@ --- a/drivers/net/ethernet/freescale/gianfar.c +++ b/drivers/net/ethernet/freescale/gianfar.c -@@ -132,7 +132,7 @@ static int gfar_poll(struct napi_struct +@@ -132,7 +132,7 @@ static int gfar_poll(struct napi_struct static void gfar_netpoll(struct net_device *dev); #endif int gfar_clean_rx_ring(struct gfar_priv_rx_q *rx_queue, int rx_work_limit); @@ -27,7 +27,7 @@ } static void gfar_schedule_cleanup(struct gfar_priv_grp *gfargrp) -@@ -2833,82 +2835,62 @@ static int gfar_poll(struct napi_struct +@@ -2833,82 +2835,62 @@ static int gfar_poll(struct napi_struct struct gfar __iomem *regs = gfargrp->regs; struct gfar_priv_tx_q *tx_queue = NULL; struct gfar_priv_rx_q *rx_queue = NULL; diff --git a/target/linux/mvebu/Makefile b/target/linux/mvebu/Makefile index 6794f5c..2b8b258 100644 --- a/target/linux/mvebu/Makefile +++ b/target/linux/mvebu/Makefile @@ -14,7 +14,7 @@ CPU_TYPE:=cortex-a9 CPU_SUBTYPE:=vfpv3 MAINTAINER:=Luka Perkov <luka@openwrt.org> -LINUX_VERSION:=3.10.15 +LINUX_VERSION:=3.10.17 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/mxs/Makefile b/target/linux/mxs/Makefile index fe08898..0f03bda 100644 --- a/target/linux/mxs/Makefile +++ b/target/linux/mxs/Makefile @@ -13,7 +13,7 @@ FEATURES:=ext4 rtc usb gpio CPU_TYPE:=arm926ej-s MAINTAINER:=Zoltan HERPAI <wigyori@uid0.hu> -LINUX_VERSION:=3.10.15 +LINUX_VERSION:=3.10.17 KERNELNAME:="zImage dtbs" define Target/Description diff --git a/target/linux/mxs/patches/200-duckbill.patch b/target/linux/mxs/patches/200-duckbill.patch index 3772e20..3416056 100644 --- a/target/linux/mxs/patches/200-duckbill.patch +++ b/target/linux/mxs/patches/200-duckbill.patch @@ -1,8 +1,6 @@ -diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile -index f0895c5..3ec78a1 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile -@@ -131,6 +131,7 @@ dtb-$(CONFIG_ARCH_MXS) += imx23-evk.dtb \ +@@ -131,6 +131,7 @@ dtb-$(CONFIG_ARCH_MXS) += imx23-evk.dtb imx28-cfa10037.dtb \ imx28-cfa10049.dtb \ imx28-evk.dtb \ @@ -10,8 +8,6 @@ index f0895c5..3ec78a1 100644 imx28-m28evk.dtb \ imx28-sps1.dtb \ imx28-tx28.dtb -diff --git a/arch/arm/mach-mxs/mach-mxs.c b/arch/arm/mach-mxs/mach-mxs.c -index 5b62b64..63916c5 100644 --- a/arch/arm/mach-mxs/mach-mxs.c +++ b/arch/arm/mach-mxs/mach-mxs.c @@ -175,6 +175,7 @@ enum mac_oui { @@ -22,7 +18,7 @@ index 5b62b64..63916c5 100644 }; static void __init update_fec_mac_prop(enum mac_oui oui) -@@ -229,6 +230,11 @@ static void __init update_fec_mac_prop(enum mac_oui oui) +@@ -229,6 +230,11 @@ static void __init update_fec_mac_prop(e macaddr[1] = 0xb9; macaddr[2] = 0xe1; break; @@ -46,7 +42,7 @@ index 5b62b64..63916c5 100644 static void __init mxs_machine_init(void) { if (of_machine_is_compatible("fsl,imx28-evk")) -@@ -372,6 +383,8 @@ static void __init mxs_machine_init(void) +@@ -372,6 +383,8 @@ static void __init mxs_machine_init(void cfa10037_init(); else if (of_machine_is_compatible("crystalfontz,cfa10049")) cfa10049_init(); diff --git a/target/linux/octeon/Makefile b/target/linux/octeon/Makefile index 2b03cd3..aeb0718 100644 --- a/target/linux/octeon/Makefile +++ b/target/linux/octeon/Makefile @@ -14,7 +14,7 @@ CPU_TYPE:=octeon CPU_CFLAGS_octeon:=-march=octeon MAINTAINER:=John Crispin <blogic@openwrt.org> -LINUX_VERSION:=3.10.15 +LINUX_VERSION:=3.10.17 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ppc40x/Makefile b/target/linux/ppc40x/Makefile index 560e712..317484d 100644 --- a/target/linux/ppc40x/Makefile +++ b/target/linux/ppc40x/Makefile @@ -13,7 +13,7 @@ FEATURES:=squashfs CPU_TYPE:=405 MAINTAINER:=Imre Kaloz <kaloz@openwrt.org> -LINUX_VERSION:=3.10.15 +LINUX_VERSION:=3.10.17 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ppc44x/Makefile b/target/linux/ppc44x/Makefile index fef3408..b9fc559 100644 --- a/target/linux/ppc44x/Makefile +++ b/target/linux/ppc44x/Makefile @@ -13,7 +13,7 @@ FEATURES:=squashfs broken CPU_TYPE:=440 MAINTAINER:=Imre Kaloz <kaloz@openwrt.org> -LINUX_VERSION:=3.10.15 +LINUX_VERSION:=3.10.17 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ramips/Makefile b/target/linux/ramips/Makefile index a1d209f..62c993f 100644 --- a/target/linux/ramips/Makefile +++ b/target/linux/ramips/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=Ralink RT288x/RT3xxx SUBTARGETS:=rt305x rt3883 mt7620a rt288x FEATURES:=squashfs gpio -LINUX_VERSION:=3.10.15 +LINUX_VERSION:=3.10.17 include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES+=\ diff --git a/target/linux/ramips/patches-3.10/0011-MIPS-ralink-add-support-for-systick-timer-found-on-n.patch b/target/linux/ramips/patches-3.10/0011-MIPS-ralink-add-support-for-systick-timer-found-on-n.patch index a69739b..5626ada 100644 --- a/target/linux/ramips/patches-3.10/0011-MIPS-ralink-add-support-for-systick-timer-found-on-n.patch +++ b/target/linux/ramips/patches-3.10/0011-MIPS-ralink-add-support-for-systick-timer-found-on-n.patch @@ -16,10 +16,8 @@ Signed-off-by: John Crispin <blogic@openwrt.org> 3 files changed, 154 insertions(+) create mode 100644 arch/mips/ralink/cevt-rt3352.c -Index: linux-3.10.13/arch/mips/ralink/Kconfig -=================================================================== ---- linux-3.10.13.orig/arch/mips/ralink/Kconfig 2013-09-27 02:18:49.000000000 +0200 -+++ linux-3.10.13/arch/mips/ralink/Kconfig 2013-10-02 21:40:41.252368892 +0200 +--- a/arch/mips/ralink/Kconfig ++++ b/arch/mips/ralink/Kconfig @@ -1,5 +1,12 @@ if RALINK @@ -33,10 +31,8 @@ Index: linux-3.10.13/arch/mips/ralink/Kconfig choice prompt "Ralink SoC selection" default SOC_RT305X -Index: linux-3.10.13/arch/mips/ralink/Makefile -=================================================================== ---- linux-3.10.13.orig/arch/mips/ralink/Makefile 2013-10-02 20:46:43.856230578 +0200 -+++ linux-3.10.13/arch/mips/ralink/Makefile 2013-10-02 21:13:11.584298451 +0200 +--- a/arch/mips/ralink/Makefile ++++ b/arch/mips/ralink/Makefile @@ -8,6 +8,8 @@ obj-y := prom.o of.o reset.o clk.o irq.o timer.o @@ -46,10 +42,8 @@ Index: linux-3.10.13/arch/mips/ralink/Makefile obj-$(CONFIG_SOC_RT288X) += rt288x.o obj-$(CONFIG_SOC_RT305X) += rt305x.o obj-$(CONFIG_SOC_RT3883) += rt3883.o -Index: linux-3.10.13/arch/mips/ralink/cevt-rt3352.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.10.13/arch/mips/ralink/cevt-rt3352.c 2013-10-02 21:13:19.396298787 +0200 +--- /dev/null ++++ b/arch/mips/ralink/cevt-rt3352.c @@ -0,0 +1,145 @@ +/* + * This file is subject to the terms and conditions of the GNU General Public diff --git a/target/linux/ramips/patches-3.10/0111-NET-MIPS-add-ralink-SoC-ethernet-driver.patch b/target/linux/ramips/patches-3.10/0111-NET-MIPS-add-ralink-SoC-ethernet-driver.patch index 962dbd3..055a776 100644 --- a/target/linux/ramips/patches-3.10/0111-NET-MIPS-add-ralink-SoC-ethernet-driver.patch +++ b/target/linux/ramips/patches-3.10/0111-NET-MIPS-add-ralink-SoC-ethernet-driver.patch @@ -46,10 +46,8 @@ Signed-off-by: John Crispin <blogic@openwrt.org> create mode 100644 drivers/net/ethernet/ralink/soc_rt305x.c create mode 100644 drivers/net/ethernet/ralink/soc_rt3883.c -Index: linux-3.10.13/arch/mips/include/asm/mach-ralink/rt305x_esw_platform.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.10.13/arch/mips/include/asm/mach-ralink/rt305x_esw_platform.h 2013-10-08 18:51:20.136389536 +0200 +--- /dev/null ++++ b/arch/mips/include/asm/mach-ralink/rt305x_esw_platform.h @@ -0,0 +1,27 @@ +/* + * Ralink RT305x SoC platform device registration @@ -78,11 +76,9 @@ Index: linux-3.10.13/arch/mips/include/asm/mach-ralink/rt305x_esw_platform.h +}; + +#endif /* _RT305X_ESW_PLATFORM_H */ -Index: linux-3.10.13/arch/mips/ralink/rt305x.c -=================================================================== ---- linux-3.10.13.orig/arch/mips/ralink/rt305x.c 2013-09-27 02:18:49.000000000 +0200 -+++ linux-3.10.13/arch/mips/ralink/rt305x.c 2013-10-08 22:40:10.480133783 +0200 -@@ -221,6 +221,7 @@ +--- a/arch/mips/ralink/rt305x.c ++++ b/arch/mips/ralink/rt305x.c +@@ -221,6 +221,7 @@ void __init ralink_clk_init(void) } ralink_clk_add("cpu", cpu_rate); @@ -90,11 +86,9 @@ Index: linux-3.10.13/arch/mips/ralink/rt305x.c ralink_clk_add("10000b00.spi", sys_rate); ralink_clk_add("10000100.timer", wdt_rate); ralink_clk_add("10000120.watchdog", wdt_rate); -Index: linux-3.10.13/drivers/net/ethernet/Kconfig -=================================================================== ---- linux-3.10.13.orig/drivers/net/ethernet/Kconfig 2013-09-27 02:18:49.000000000 +0200 -+++ linux-3.10.13/drivers/net/ethernet/Kconfig 2013-10-08 18:51:20.136389536 +0200 -@@ -135,6 +135,7 @@ +--- a/drivers/net/ethernet/Kconfig ++++ b/drivers/net/ethernet/Kconfig +@@ -135,6 +135,7 @@ config ETHOC source "drivers/net/ethernet/packetengines/Kconfig" source "drivers/net/ethernet/pasemi/Kconfig" source "drivers/net/ethernet/qlogic/Kconfig" @@ -102,11 +96,9 @@ Index: linux-3.10.13/drivers/net/ethernet/Kconfig source "drivers/net/ethernet/realtek/Kconfig" source "drivers/net/ethernet/renesas/Kconfig" source "drivers/net/ethernet/rdc/Kconfig" -Index: linux-3.10.13/drivers/net/ethernet/Makefile -=================================================================== ---- linux-3.10.13.orig/drivers/net/ethernet/Makefile 2013-09-27 02:18:49.000000000 +0200 -+++ linux-3.10.13/drivers/net/ethernet/Makefile 2013-10-08 18:51:20.136389536 +0200 -@@ -53,6 +53,7 @@ +--- a/drivers/net/ethernet/Makefile ++++ b/drivers/net/ethernet/Makefile +@@ -53,6 +53,7 @@ obj-$(CONFIG_ETHOC) += ethoc.o obj-$(CONFIG_NET_PACKET_ENGINE) += packetengines/ obj-$(CONFIG_NET_VENDOR_PASEMI) += pasemi/ obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/ @@ -114,10 +106,8 @@ Index: linux-3.10.13/drivers/net/ethernet/Makefile obj-$(CONFIG_NET_VENDOR_REALTEK) += realtek/ obj-$(CONFIG_SH_ETH) += renesas/ obj-$(CONFIG_NET_VENDOR_RDC) += rdc/ -Index: linux-3.10.13/drivers/net/ethernet/ralink/Kconfig -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.10.13/drivers/net/ethernet/ralink/Kconfig 2013-10-08 18:51:20.136389536 +0200 +--- /dev/null ++++ b/drivers/net/ethernet/ralink/Kconfig @@ -0,0 +1,31 @@ +config NET_RALINK + tristate "Ralink RT288X/RT3X5X/RT3662/RT3883/MT7620 ethernet driver" @@ -150,10 +140,8 @@ Index: linux-3.10.13/drivers/net/ethernet/ralink/Kconfig + select PHYLIB + select SWCONFIG +endif -Index: linux-3.10.13/drivers/net/ethernet/ralink/Makefile -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.10.13/drivers/net/ethernet/ralink/Makefile 2013-10-08 18:51:20.136389536 +0200 +--- /dev/null ++++ b/drivers/net/ethernet/ralink/Makefile @@ -0,0 +1,18 @@ +# +# Makefile for the Ralink SoCs built-in ethernet macs @@ -173,10 +161,8 @@ Index: linux-3.10.13/drivers/net/ethernet/ralink/Makefile +ralink-eth-$(CONFIG_SOC_MT7620) += soc_mt7620.o + +obj-$(CONFIG_NET_RALINK) += ralink-eth.o -Index: linux-3.10.13/drivers/net/ethernet/ralink/esw_rt3052.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.10.13/drivers/net/ethernet/ralink/esw_rt3052.c 2013-10-08 18:51:20.136389536 +0200 +--- /dev/null ++++ b/drivers/net/ethernet/ralink/esw_rt3052.c @@ -0,0 +1,1463 @@ +/* + * This program is free software; you can redistribute it and/or modify @@ -1641,10 +1627,8 @@ Index: linux-3.10.13/drivers/net/ethernet/ralink/esw_rt3052.c +{ + platform_driver_unregister(&esw_driver); +} -Index: linux-3.10.13/drivers/net/ethernet/ralink/esw_rt3052.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.10.13/drivers/net/ethernet/ralink/esw_rt3052.h 2013-10-08 18:51:20.136389536 +0200 +--- /dev/null ++++ b/drivers/net/ethernet/ralink/esw_rt3052.h @@ -0,0 +1,32 @@ +/* + * This program is free software; you can redistribute it and/or modify @@ -1678,10 +1662,8 @@ Index: linux-3.10.13/drivers/net/ethernet/ralink/esw_rt3052.h + +#endif +#endif -Index: linux-3.10.13/drivers/net/ethernet/ralink/gsw_mt7620a.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.10.13/drivers/net/ethernet/ralink/gsw_mt7620a.c 2013-10-08 22:38:18.884129024 +0200 +--- /dev/null ++++ b/drivers/net/ethernet/ralink/gsw_mt7620a.c @@ -0,0 +1,566 @@ +/* + * This program is free software; you can redistribute it and/or modify @@ -2249,10 +2231,8 @@ Index: linux-3.10.13/drivers/net/ethernet/ralink/gsw_mt7620a.c + + return 0; +} -Index: linux-3.10.13/drivers/net/ethernet/ralink/gsw_mt7620a.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.10.13/drivers/net/ethernet/ralink/gsw_mt7620a.h 2013-10-08 18:51:20.136389536 +0200 +--- /dev/null ++++ b/drivers/net/ethernet/ralink/gsw_mt7620a.h @@ -0,0 +1,30 @@ +/* + * This program is free software; you can redistribute it and/or modify @@ -2284,10 +2264,8 @@ Index: linux-3.10.13/drivers/net/ethernet/ralink/gsw_mt7620a.h +extern int mt7620a_has_carrier(struct fe_priv *priv); + +#endif -Index: linux-3.10.13/drivers/net/ethernet/ralink/mdio.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.10.13/drivers/net/ethernet/ralink/mdio.c 2013-10-08 18:51:20.136389536 +0200 +--- /dev/null ++++ b/drivers/net/ethernet/ralink/mdio.c @@ -0,0 +1,244 @@ +/* + * This program is free software; you can redistribute it and/or modify @@ -2533,10 +2511,8 @@ Index: linux-3.10.13/drivers/net/ethernet/ralink/mdio.c + of_node_put(priv->mii_bus->dev.of_node); + kfree(priv->mii_bus); +} -Index: linux-3.10.13/drivers/net/ethernet/ralink/mdio.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.10.13/drivers/net/ethernet/ralink/mdio.h 2013-10-08 18:51:20.136389536 +0200 +--- /dev/null ++++ b/drivers/net/ethernet/ralink/mdio.h @@ -0,0 +1,29 @@ +/* + * This program is free software; you can redistribute it and/or modify @@ -2567,10 +2543,8 @@ Index: linux-3.10.13/drivers/net/ethernet/ralink/mdio.h +static inline void fe_mdio_cleanup(struct fe_priv *priv) {} +#endif +#endif -Index: linux-3.10.13/drivers/net/ethernet/ralink/mdio_rt2880.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.10.13/drivers/net/ethernet/ralink/mdio_rt2880.c 2013-10-08 18:51:20.136389536 +0200 +--- /dev/null ++++ b/drivers/net/ethernet/ralink/mdio_rt2880.c @@ -0,0 +1,232 @@ +/* + * This program is free software; you can redistribute it and/or modify @@ -2804,10 +2778,8 @@ Index: linux-3.10.13/drivers/net/ethernet/ralink/mdio_rt2880.c + + return; +} -Index: linux-3.10.13/drivers/net/ethernet/ralink/mdio_rt2880.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.10.13/drivers/net/ethernet/ralink/mdio_rt2880.h 2013-10-08 18:51:20.136389536 +0200 +--- /dev/null ++++ b/drivers/net/ethernet/ralink/mdio_rt2880.h @@ -0,0 +1,26 @@ +/* + * This program is free software; you can redistribute it and/or modify @@ -2835,10 +2807,8 @@ Index: linux-3.10.13/drivers/net/ethernet/ralink/mdio_rt2880.h +void rt2880_port_init(struct fe_priv *priv, struct device_node *np); + +#endif -Index: linux-3.10.13/drivers/net/ethernet/ralink/ralink_soc_eth.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.10.13/drivers/net/ethernet/ralink/ralink_soc_eth.c 2013-10-08 20:19:33.904615836 +0200 +--- /dev/null ++++ b/drivers/net/ethernet/ralink/ralink_soc_eth.c @@ -0,0 +1,741 @@ +/* + * This program is free software; you can redistribute it and/or modify @@ -3581,10 +3551,8 @@ Index: linux-3.10.13/drivers/net/ethernet/ralink/ralink_soc_eth.c +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("John Crispin <blogic@openwrt.org>"); +MODULE_DESCRIPTION("Ethernet driver for Ralink SoC"); -Index: linux-3.10.13/drivers/net/ethernet/ralink/ralink_soc_eth.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.10.13/drivers/net/ethernet/ralink/ralink_soc_eth.h 2013-10-08 18:51:20.136389536 +0200 +--- /dev/null ++++ b/drivers/net/ethernet/ralink/ralink_soc_eth.h @@ -0,0 +1,375 @@ +/* + * This program is free software; you can redistribute it and/or modify @@ -3961,10 +3929,8 @@ Index: linux-3.10.13/drivers/net/ethernet/ralink/ralink_soc_eth.h +u32 fe_r32(unsigned reg); + +#endif /* FE_ETH_H */ -Index: linux-3.10.13/drivers/net/ethernet/ralink/soc_mt7620.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.10.13/drivers/net/ethernet/ralink/soc_mt7620.c 2013-10-08 18:51:20.136389536 +0200 +--- /dev/null ++++ b/drivers/net/ethernet/ralink/soc_mt7620.c @@ -0,0 +1,112 @@ +/* + * This program is free software; you can redistribute it and/or modify @@ -4078,10 +4044,8 @@ Index: linux-3.10.13/drivers/net/ethernet/ralink/soc_mt7620.c +}; + +MODULE_DEVICE_TABLE(of, of_fe_match); -Index: linux-3.10.13/drivers/net/ethernet/ralink/soc_rt2880.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.10.13/drivers/net/ethernet/ralink/soc_rt2880.c 2013-10-08 18:51:20.136389536 +0200 +--- /dev/null ++++ b/drivers/net/ethernet/ralink/soc_rt2880.c @@ -0,0 +1,51 @@ +/* + * This program is free software; you can redistribute it and/or modify @@ -4134,10 +4098,8 @@ Index: linux-3.10.13/drivers/net/ethernet/ralink/soc_rt2880.c +}; + +MODULE_DEVICE_TABLE(of, of_fe_match); -Index: linux-3.10.13/drivers/net/ethernet/ralink/soc_rt305x.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.10.13/drivers/net/ethernet/ralink/soc_rt305x.c 2013-10-08 18:51:20.136389536 +0200 +--- /dev/null ++++ b/drivers/net/ethernet/ralink/soc_rt305x.c @@ -0,0 +1,113 @@ +/* + * This program is free software; you can redistribute it and/or modify @@ -4252,10 +4214,8 @@ Index: linux-3.10.13/drivers/net/ethernet/ralink/soc_rt305x.c +}; + +MODULE_DEVICE_TABLE(of, of_fe_match); -Index: linux-3.10.13/drivers/net/ethernet/ralink/soc_rt3883.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.10.13/drivers/net/ethernet/ralink/soc_rt3883.c 2013-10-08 18:51:20.140389534 +0200 +--- /dev/null ++++ b/drivers/net/ethernet/ralink/soc_rt3883.c @@ -0,0 +1,60 @@ +/* + * This program is free software; you can redistribute it and/or modify @@ -4317,10 +4277,8 @@ Index: linux-3.10.13/drivers/net/ethernet/ralink/soc_rt3883.c + +MODULE_DEVICE_TABLE(of, of_fe_match); + -Index: linux-3.10.13/drivers/net/ethernet/ralink/mt7530.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.10.13/drivers/net/ethernet/ralink/mt7530.c 2013-10-08 22:36:55.640125451 +0200 +--- /dev/null ++++ b/drivers/net/ethernet/ralink/mt7530.c @@ -0,0 +1,467 @@ +/* + * This program is free software; you can redistribute it and/or @@ -4789,10 +4747,8 @@ Index: linux-3.10.13/drivers/net/ethernet/ralink/mt7530.c + + return 0; +} -Index: linux-3.10.13/drivers/net/ethernet/ralink/mt7530.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.10.13/drivers/net/ethernet/ralink/mt7530.h 2013-10-08 18:51:20.140389534 +0200 +--- /dev/null ++++ b/drivers/net/ethernet/ralink/mt7530.h @@ -0,0 +1,20 @@ +/* + * This program is free software; you can redistribute it and/or diff --git a/target/linux/ramips/patches-3.10/0122-pinmux.patch b/target/linux/ramips/patches-3.10/0122-pinmux.patch index 6923355..84f713b 100644 --- a/target/linux/ramips/patches-3.10/0122-pinmux.patch +++ b/target/linux/ramips/patches-3.10/0122-pinmux.patch @@ -14,11 +14,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org> 6 files changed, 385 insertions(+), 19 deletions(-) create mode 100644 drivers/pinctrl/pinctrl-rt2880.c -Index: linux-3.10.13/arch/mips/Kconfig -=================================================================== ---- linux-3.10.13.orig/arch/mips/Kconfig 2013-10-02 16:59:28.532051276 +0200 -+++ linux-3.10.13/arch/mips/Kconfig 2013-10-02 16:59:29.440051316 +0200 -@@ -446,6 +446,8 @@ +--- a/arch/mips/Kconfig ++++ b/arch/mips/Kconfig +@@ -446,6 +446,8 @@ config RALINK select HAVE_MACH_CLKDEV select CLKDEV_LOOKUP select ARCH_REQUIRE_GPIOLIB @@ -27,11 +25,9 @@ Index: linux-3.10.13/arch/mips/Kconfig config SGI_IP22 bool "SGI IP22 (Indy/Indigo2)" -Index: linux-3.10.13/drivers/pinctrl/Kconfig -=================================================================== ---- linux-3.10.13.orig/drivers/pinctrl/Kconfig 2013-09-27 02:18:49.000000000 +0200 -+++ linux-3.10.13/drivers/pinctrl/Kconfig 2013-10-02 16:59:29.440051316 +0200 -@@ -114,6 +114,11 @@ +--- a/drivers/pinctrl/Kconfig ++++ b/drivers/pinctrl/Kconfig +@@ -114,6 +114,11 @@ config PINCTRL_LANTIQ select PINMUX select PINCONF @@ -43,11 +39,9 @@ Index: linux-3.10.13/drivers/pinctrl/Kconfig config PINCTRL_FALCON bool depends on SOC_FALCON -Index: linux-3.10.13/drivers/pinctrl/Makefile -=================================================================== ---- linux-3.10.13.orig/drivers/pinctrl/Makefile 2013-09-27 02:18:49.000000000 +0200 -+++ linux-3.10.13/drivers/pinctrl/Makefile 2013-10-02 16:59:29.440051316 +0200 -@@ -45,6 +45,7 @@ +--- a/drivers/pinctrl/Makefile ++++ b/drivers/pinctrl/Makefile +@@ -45,6 +45,7 @@ obj-$(CONFIG_PINCTRL_EXYNOS5440) += pinc obj-$(CONFIG_PINCTRL_S3C64XX) += pinctrl-s3c64xx.o obj-$(CONFIG_PINCTRL_XWAY) += pinctrl-xway.o obj-$(CONFIG_PINCTRL_LANTIQ) += pinctrl-lantiq.o @@ -55,10 +49,8 @@ Index: linux-3.10.13/drivers/pinctrl/Makefile obj-$(CONFIG_PLAT_ORION) += mvebu/ obj-$(CONFIG_ARCH_SHMOBILE) += sh-pfc/ -Index: linux-3.10.13/drivers/pinctrl/pinctrl-rt2880.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.10.13/drivers/pinctrl/pinctrl-rt2880.c 2013-10-02 18:24:18.556268869 +0200 +--- /dev/null ++++ b/drivers/pinctrl/pinctrl-rt2880.c @@ -0,0 +1,456 @@ +/* + * linux/drivers/pinctrl/pinctrl-rt2880.c @@ -516,10 +508,8 @@ Index: linux-3.10.13/drivers/pinctrl/pinctrl-rt2880.c +} + +core_initcall_sync(rt2880_pinmux_init); -Index: linux-3.10.13/arch/mips/include/asm/mach-ralink/pinmux.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.10.13/arch/mips/include/asm/mach-ralink/pinmux.h 2013-10-02 16:59:29.444051317 +0200 +--- /dev/null ++++ b/arch/mips/include/asm/mach-ralink/pinmux.h @@ -0,0 +1,47 @@ +/* + * This program is free software; you can redistribute it and/or modify @@ -568,10 +558,8 @@ Index: linux-3.10.13/arch/mips/include/asm/mach-ralink/pinmux.h +extern struct rt2880_pmx_group *rt2880_pinmux_data; + +#endif -Index: linux-3.10.13/arch/mips/ralink/mt7620.c -=================================================================== ---- linux-3.10.13.orig/arch/mips/ralink/mt7620.c 2013-10-02 16:59:28.912051293 +0200 -+++ linux-3.10.13/arch/mips/ralink/mt7620.c 2013-10-02 18:23:35.940267055 +0200 +--- a/arch/mips/ralink/mt7620.c ++++ b/arch/mips/ralink/mt7620.c @@ -17,6 +17,7 @@ #include <asm/mipsregs.h> #include <asm/mach-ralink/ralink_regs.h> @@ -580,7 +568,7 @@ Index: linux-3.10.13/arch/mips/ralink/mt7620.c #include "common.h" -@@ -48,118 +49,40 @@ +@@ -48,118 +49,40 @@ static int dram_type; /* the pll dividers */ static u32 mt7620_clk_divider[] = { 2, 3, 4, 8 }; @@ -732,17 +720,15 @@ Index: linux-3.10.13/arch/mips/ralink/mt7620.c }; void __init ralink_clk_init(void) -@@ -281,4 +204,6 @@ +@@ -281,4 +204,6 @@ void prom_soc_init(struct ralink_soc_inf (pmu0 & PMU_SW_SET) ? ("sw") : ("hw")); pr_info("Digital PMU set to %s control\n", (pmu1 & DIG_SW_SEL) ? ("sw") : ("hw")); + + rt2880_pinmux_data = mt7620a_pinmux_data; } -Index: linux-3.10.13/arch/mips/ralink/rt305x.c -=================================================================== ---- linux-3.10.13.orig/arch/mips/ralink/rt305x.c 2013-10-02 16:59:29.140051302 +0200 -+++ linux-3.10.13/arch/mips/ralink/rt305x.c 2013-10-02 16:59:29.444051317 +0200 +--- a/arch/mips/ralink/rt305x.c ++++ b/arch/mips/ralink/rt305x.c @@ -17,90 +17,71 @@ #include <asm/mipsregs.h> #include <asm/mach-ralink/ralink_regs.h> @@ -892,7 +878,7 @@ Index: linux-3.10.13/arch/mips/ralink/rt305x.c }; static void rt305x_wdt_reset(void) -@@ -114,14 +95,6 @@ +@@ -114,14 +95,6 @@ static void rt305x_wdt_reset(void) rt_sysc_w32(t, SYSC_REG_SYSTEM_CONFIG); } @@ -907,7 +893,7 @@ Index: linux-3.10.13/arch/mips/ralink/rt305x.c static unsigned long rt5350_get_mem_size(void) { void __iomem *sysc = (void __iomem *) KSEG1ADDR(RT305X_SYSC_BASE); -@@ -291,11 +264,14 @@ +@@ -291,11 +264,14 @@ void prom_soc_init(struct ralink_soc_inf soc_info->mem_base = RT305X_SDRAM_BASE; if (soc_is_rt5350()) { soc_info->mem_size = rt5350_get_mem_size(); @@ -922,11 +908,9 @@ Index: linux-3.10.13/arch/mips/ralink/rt305x.c + rt2880_pinmux_data = rt3352_pinmux_data; } } -Index: linux-3.10.13/arch/mips/include/asm/mach-ralink/rt305x.h -=================================================================== ---- linux-3.10.13.orig/arch/mips/include/asm/mach-ralink/rt305x.h 2013-09-27 02:18:49.000000000 +0200 -+++ linux-3.10.13/arch/mips/include/asm/mach-ralink/rt305x.h 2013-10-02 16:59:29.444051317 +0200 -@@ -125,24 +125,28 @@ +--- a/arch/mips/include/asm/mach-ralink/rt305x.h ++++ b/arch/mips/include/asm/mach-ralink/rt305x.h +@@ -125,24 +125,28 @@ static inline int soc_is_rt5350(void) #define RT305X_GPIO_GE0_TXD0 40 #define RT305X_GPIO_GE0_RXCLK 51 @@ -970,10 +954,8 @@ Index: linux-3.10.13/arch/mips/include/asm/mach-ralink/rt305x.h #define RT3352_SYSC_REG_SYSCFG0 0x010 #define RT3352_SYSC_REG_SYSCFG1 0x014 -Index: linux-3.10.13/arch/mips/include/asm/mach-ralink/mt7620.h -=================================================================== ---- linux-3.10.13.orig/arch/mips/include/asm/mach-ralink/mt7620.h 2013-10-02 16:59:28.708051287 +0200 -+++ linux-3.10.13/arch/mips/include/asm/mach-ralink/mt7620.h 2013-10-02 16:59:29.444051317 +0200 +--- a/arch/mips/include/asm/mach-ralink/mt7620.h ++++ b/arch/mips/include/asm/mach-ralink/mt7620.h @@ -59,7 +59,6 @@ #define MT7620_DDR2_SIZE_MIN 32 #define MT7620_DDR2_SIZE_MAX 256 @@ -1010,10 +992,8 @@ Index: linux-3.10.13/arch/mips/include/asm/mach-ralink/mt7620.h +#define MT7620_GPIO_MODE_WDT 22 #endif -Index: linux-3.10.13/arch/mips/include/asm/mach-ralink/rt3883.h -=================================================================== ---- linux-3.10.13.orig/arch/mips/include/asm/mach-ralink/rt3883.h 2013-09-27 02:18:49.000000000 +0200 -+++ linux-3.10.13/arch/mips/include/asm/mach-ralink/rt3883.h 2013-10-02 16:59:29.444051317 +0200 +--- a/arch/mips/include/asm/mach-ralink/rt3883.h ++++ b/arch/mips/include/asm/mach-ralink/rt3883.h @@ -112,8 +112,6 @@ #define RT3883_CLKCFG1_PCI_CLK_EN BIT(19) #define RT3883_CLKCFG1_UPHY0_CLK_EN BIT(18) @@ -1044,10 +1024,8 @@ Index: linux-3.10.13/arch/mips/include/asm/mach-ralink/rt3883.h #define RT3883_GPIO_MODE_PCI_SHIFT 11 #define RT3883_GPIO_MODE_PCI_MASK 0x7 #define RT3883_GPIO_MODE_PCI (RT3883_GPIO_MODE_PCI_MASK << RT3883_GPIO_MODE_PCI_SHIFT) -Index: linux-3.10.13/arch/mips/ralink/common.h -=================================================================== ---- linux-3.10.13.orig/arch/mips/ralink/common.h 2013-10-02 16:59:28.532051276 +0200 -+++ linux-3.10.13/arch/mips/ralink/common.h 2013-10-02 16:59:29.444051317 +0200 +--- a/arch/mips/ralink/common.h ++++ b/arch/mips/ralink/common.h @@ -11,25 +11,6 @@ #define RAMIPS_SYS_TYPE_LEN 32 @@ -1074,10 +1052,8 @@ Index: linux-3.10.13/arch/mips/ralink/common.h struct ralink_soc_info { unsigned char sys_type[RAMIPS_SYS_TYPE_LEN]; unsigned char *compatible; -Index: linux-3.10.13/arch/mips/ralink/rt3883.c -=================================================================== ---- linux-3.10.13.orig/arch/mips/ralink/rt3883.c 2013-09-27 02:18:49.000000000 +0200 -+++ linux-3.10.13/arch/mips/ralink/rt3883.c 2013-10-02 16:59:29.444051317 +0200 +--- a/arch/mips/ralink/rt3883.c ++++ b/arch/mips/ralink/rt3883.c @@ -17,132 +17,50 @@ #include <asm/mipsregs.h> #include <asm/mach-ralink/ralink_regs.h> @@ -1249,7 +1225,7 @@ Index: linux-3.10.13/arch/mips/ralink/rt3883.c }; static void rt3883_wdt_reset(void) -@@ -155,17 +73,6 @@ +@@ -155,17 +73,6 @@ static void rt3883_wdt_reset(void) rt_sysc_w32(t, RT3883_SYSC_REG_SYSCFG1); } @@ -1267,7 +1243,7 @@ Index: linux-3.10.13/arch/mips/ralink/rt3883.c void __init ralink_clk_init(void) { unsigned long cpu_rate, sys_rate; -@@ -243,4 +150,6 @@ +@@ -243,4 +150,6 @@ void prom_soc_init(struct ralink_soc_inf soc_info->mem_base = RT3883_SDRAM_BASE; soc_info->mem_size_min = RT3883_MEM_SIZE_MIN; soc_info->mem_size_max = RT3883_MEM_SIZE_MAX; diff --git a/target/linux/rb532/Makefile b/target/linux/rb532/Makefile index 24b3d4c..12eb9b3 100644 --- a/target/linux/rb532/Makefile +++ b/target/linux/rb532/Makefile @@ -11,7 +11,7 @@ BOARD:=rb532 BOARDNAME:=Mikrotik RouterBoard 532 FEATURES:=pci targz broken -LINUX_VERSION:=3.10.15 +LINUX_VERSION:=3.10.17 include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += wpad-mini kmod-madwifi kmod-input-rb532 diff --git a/target/linux/realview/Makefile b/target/linux/realview/Makefile index a7ca205..eb3ab53 100644 --- a/target/linux/realview/Makefile +++ b/target/linux/realview/Makefile @@ -14,7 +14,7 @@ CPU_TYPE:=mpcore CPU_SUBTYPE:=vfp MAINTAINER:=Florian Fainelli <florian@openwrt.org> -LINUX_VERSION:=3.10.15 +LINUX_VERSION:=3.10.17 DEVICE_TYPE:=developerboard diff --git a/target/linux/x86/alix2/target.mk b/target/linux/x86/alix2/target.mk index 36243a2..df046fb 100644 --- a/target/linux/x86/alix2/target.mk +++ b/target/linux/x86/alix2/target.mk @@ -19,7 +19,7 @@ DEFAULT_PACKAGES += \ kmod-ledtrig-heartbeat kmod-ledtrig-gpio \ kmod-ledtrig-netdev \ kmod-cpu-msr hwclock wpad -LINUX_VERSION:=3.10.15 +LINUX_VERSION:=3.10.17 CS5535_MASK:=0x0b000042 CPU_TYPE := geode diff --git a/target/linux/x86/generic/target.mk b/target/linux/x86/generic/target.mk index 41b8700..d95c0dc 100644 --- a/target/linux/x86/generic/target.mk +++ b/target/linux/x86/generic/target.mk @@ -1,6 +1,6 @@ BOARDNAME:=Generic -LINUX_VERSION:=3.10.15 +LINUX_VERSION:=3.10.17 define Target/Description Build firmware images for x86 based boards diff --git a/target/linux/x86/patches-3.10/150-pit-tick-rate.patch b/target/linux/x86/patches-3.10/150-pit-tick-rate.patch index e53dfcc..7bf9bbd 100644 --- a/target/linux/x86/patches-3.10/150-pit-tick-rate.patch +++ b/target/linux/x86/patches-3.10/150-pit-tick-rate.patch @@ -1,7 +1,7 @@ --- a/include/linux/timex.h +++ b/include/linux/timex.h -@@ -143,6 +143,10 @@ extern void hardpps(const struct timespe - int read_current_timer(unsigned long *timer_val); +@@ -144,6 +144,10 @@ int read_current_timer(unsigned long *ti + void ntp_notify_cmos_timer(void); /* The clock frequency of the i8253/i8254 PIT */ +#ifdef CONFIG_X86_RDC321X diff --git a/target/linux/xburst/Makefile b/target/linux/xburst/Makefile index ea65514..4f89fd5 100644 --- a/target/linux/xburst/Makefile +++ b/target/linux/xburst/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=Ingenic XBurst FEATURES:=targz ubifs audio SUBTARGETS:=qi_lb60 n516 n526 id800wt -LINUX_VERSION:=3.10.15 +LINUX_VERSION:=3.10.17 DEVICE_TYPE=other |