diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2012-03-12 17:32:38 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2012-03-12 17:32:38 +0000 |
commit | 3b5159b828183d64ca7fcb8180249d20c6382f3f (patch) | |
tree | 87aee05772b3ecc1134a189196b3be2c4a852cc0 /target/linux/generic | |
parent | 47df086d3a195617a079643f04d40d6d91eaf1bf (diff) | |
download | master-187ad058-3b5159b828183d64ca7fcb8180249d20c6382f3f.tar.gz master-187ad058-3b5159b828183d64ca7fcb8180249d20c6382f3f.tar.bz2 master-187ad058-3b5159b828183d64ca7fcb8180249d20c6382f3f.zip |
linux/3.3: refresh patches against 3.3-rc7
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30908 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic')
-rw-r--r-- | target/linux/generic/patches-3.3/643-bridge_remove_ipv6_dependency.patch | 8 | ||||
-rw-r--r-- | target/linux/generic/patches-3.3/950-vm_exports.patch | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/generic/patches-3.3/643-bridge_remove_ipv6_dependency.patch b/target/linux/generic/patches-3.3/643-bridge_remove_ipv6_dependency.patch index 1ca8979bfc..301b6be441 100644 --- a/target/linux/generic/patches-3.3/643-bridge_remove_ipv6_dependency.patch +++ b/target/linux/generic/patches-3.3/643-bridge_remove_ipv6_dependency.patch @@ -32,7 +32,7 @@ +obj-$(subst m,y,$(CONFIG_IPV6)) += inet6_stubs.o --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c -@@ -1099,7 +1099,7 @@ out: +@@ -1103,7 +1103,7 @@ out: return ret; } @@ -41,7 +41,7 @@ const struct in6_addr *daddr, unsigned int prefs, struct in6_addr *saddr) { -@@ -1224,7 +1224,6 @@ try_nextdev: +@@ -1228,7 +1228,6 @@ try_nextdev: in6_ifa_put(hiscore->ifa); return 0; } @@ -49,7 +49,7 @@ int ipv6_get_lladdr(struct net_device *dev, struct in6_addr *addr, unsigned char banned_flags) -@@ -4836,6 +4835,9 @@ int __init addrconf_init(void) +@@ -4840,6 +4839,9 @@ int __init addrconf_init(void) ipv6_addr_label_rtnl_register(); @@ -59,7 +59,7 @@ return 0; errout: rtnl_af_unregister(&inet6_ops); -@@ -4854,6 +4856,9 @@ void addrconf_cleanup(void) +@@ -4858,6 +4860,9 @@ void addrconf_cleanup(void) struct net_device *dev; int i; diff --git a/target/linux/generic/patches-3.3/950-vm_exports.patch b/target/linux/generic/patches-3.3/950-vm_exports.patch index 5b5a17728a..3fa1ece71f 100644 --- a/target/linux/generic/patches-3.3/950-vm_exports.patch +++ b/target/linux/generic/patches-3.3/950-vm_exports.patch @@ -61,7 +61,7 @@ { --- a/kernel/sched/core.c +++ b/kernel/sched/core.c -@@ -3856,6 +3856,7 @@ int can_nice(const struct task_struct *p +@@ -3855,6 +3855,7 @@ int can_nice(const struct task_struct *p return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) || capable(CAP_SYS_NICE)); } |