aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.9/643-bridge_remove_ipv6_dependency.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2013-04-28 11:55:23 +0000
committerJonas Gorski <jogo@openwrt.org>2013-04-28 11:55:23 +0000
commitad1d3f00cb8124980620a7aa4e6ce0460c2d8778 (patch)
tree4c47aa1fba9ac436f3cc9b81e45b12392fc7dc35 /target/linux/generic/patches-3.9/643-bridge_remove_ipv6_dependency.patch
parenta33dd13c98772202be29835d93d70ae41c72f600 (diff)
downloadupstream-ad1d3f00cb8124980620a7aa4e6ce0460c2d8778.tar.gz
upstream-ad1d3f00cb8124980620a7aa4e6ce0460c2d8778.tar.bz2
upstream-ad1d3f00cb8124980620a7aa4e6ce0460c2d8778.zip
kernel: update linux 3.9 patches to rc8
Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 36469
Diffstat (limited to 'target/linux/generic/patches-3.9/643-bridge_remove_ipv6_dependency.patch')
-rw-r--r--target/linux/generic/patches-3.9/643-bridge_remove_ipv6_dependency.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/patches-3.9/643-bridge_remove_ipv6_dependency.patch b/target/linux/generic/patches-3.9/643-bridge_remove_ipv6_dependency.patch
index aac820039b..428713b530 100644
--- a/target/linux/generic/patches-3.9/643-bridge_remove_ipv6_dependency.patch
+++ b/target/linux/generic/patches-3.9/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
-@@ -1250,7 +1250,7 @@ out:
+@@ -1248,7 +1248,7 @@ out:
return ret;
}
@@ -41,7 +41,7 @@
const struct in6_addr *daddr, unsigned int prefs,
struct in6_addr *saddr)
{
-@@ -1375,7 +1375,6 @@ try_nextdev:
+@@ -1373,7 +1373,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)
-@@ -4965,6 +4964,9 @@ int __init addrconf_init(void)
+@@ -4947,6 +4946,9 @@ int __init addrconf_init(void)
ipv6_addr_label_rtnl_register();
@@ -59,7 +59,7 @@
return 0;
errout:
rtnl_af_unregister(&inet6_ops);
-@@ -4983,6 +4985,9 @@ void addrconf_cleanup(void)
+@@ -4965,6 +4967,9 @@ void addrconf_cleanup(void)
struct net_device *dev;
int i;