From b6b06000ebe2ffd2ebca24417ea9b9080cb6d643 Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Wed, 23 Oct 2013 12:51:05 +0000 Subject: kernel: update 3.10 to 3.10.17 Signed-off-by: Gabor Juhos SVN-Revision: 38506 --- .../110-net_fix_multiqueue_selection.patch | 41 ---------------------- .../643-bridge_remove_ipv6_dependency.patch | 6 ++-- .../644-bridge_optimize_netfilter_hooks.patch | 2 +- .../generic/patches-3.10/902-debloat_proc.patch | 8 ++--- .../patches-3.10/921-use_preinit_as_init.patch | 2 +- .../generic/patches-3.10/950-vm_exports.patch | 6 ++-- 6 files changed, 12 insertions(+), 53 deletions(-) delete mode 100644 target/linux/generic/patches-3.10/110-net_fix_multiqueue_selection.patch (limited to 'target/linux/generic') 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 6a07ee8c0d..0000000000 --- a/target/linux/generic/patches-3.10/110-net_fix_multiqueue_selection.patch +++ /dev/null @@ -1,41 +0,0 @@ -From: Eric Dumazet - -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 -Cc: Alexander Duyck -Acked-by: Alexander Duyck - ---- -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 010c6048af..4e34d51855 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 5b5dba5041..ac41cf5492 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 907e04624c..d3d6aaaca4 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 13f4a9adb7..3eee3e8c52 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 c19c3320af..0ec0623306 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//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); -- cgit v1.2.3