domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

linux/3.3: refresh patches against 3.3-rc7

Browse Source 
SVN-Revision: 30908
This commit is contained in:
Gabor Juhos
2012-03-12 17:32:38 +00:00
parent 18f7081e17
commit 727a8c20c0
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
target/linux/generic/patches-3.3/643-bridge_remove_ipv6_dependency.patch
View File

@@ -32,7 +32,7 @@
+obj-$(subst m,y,$(CONFIG_IPV6)) += inet6_stubs.o +obj-$(subst m,y,$(CONFIG_IPV6)) += inet6_stubs.o
--- a/net/ipv6/addrconf.c --- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c
@@ -1099,7 +1099,7 @@ out: @@ -1103,7 +1103,7 @@ out:
return ret; return ret;
} }
@@ -41,7 +41,7 @@
const struct in6_addr *daddr, unsigned int prefs, const struct in6_addr *daddr, unsigned int prefs,
struct in6_addr *saddr) struct in6_addr *saddr)
{ {
@@ -1224,7 +1224,6 @@ try_nextdev: @@ -1228,7 +1228,6 @@ try_nextdev:
in6_ifa_put(hiscore->ifa); in6_ifa_put(hiscore->ifa);
return 0; return 0;
} }
@@ -49,7 +49,7 @@
int ipv6_get_lladdr(struct net_device *dev, struct in6_addr *addr, int ipv6_get_lladdr(struct net_device *dev, struct in6_addr *addr,
unsigned char banned_flags) 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(); ipv6_addr_label_rtnl_register();
@@ -59,7 +59,7 @@
return 0; return 0;
errout: errout:
rtnl_af_unregister(&inet6_ops); 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; struct net_device *dev;
int i; int i;

2
target/linux/generic/patches-3.3/950-vm_exports.patch
View File

@@ -61,7 +61,7 @@
{ {
--- a/kernel/sched/core.c --- a/kernel/sched/core.c
+++ b/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) || return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
capable(CAP_SYS_NICE)); capable(CAP_SYS_NICE));
} }