summaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.8/643-bridge_remove_ipv6_dependency.patch
diff options
context:
space:
mode:
authorflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-01-24 17:04:52 +0000
committerflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-01-24 17:04:52 +0000
commit8b8cde72a47f02a1347b983303c87f9176b7470a (patch)
treee9839ece130bfdf49bad36e24223d28e3899e6d4 /target/linux/generic/patches-3.8/643-bridge_remove_ipv6_dependency.patch
parent9a15e912272ceffd4e58beaccab773006ebde22f (diff)
kernel: refresh 3.8 patches
Signed-off-by: Florian Fainelli <florian@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35317 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.8/643-bridge_remove_ipv6_dependency.patch')
-rw-r--r--target/linux/generic/patches-3.8/643-bridge_remove_ipv6_dependency.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/patches-3.8/643-bridge_remove_ipv6_dependency.patch b/target/linux/generic/patches-3.8/643-bridge_remove_ipv6_dependency.patch
index a1563f44e..b3746978d 100644
--- a/target/linux/generic/patches-3.8/643-bridge_remove_ipv6_dependency.patch
+++ b/target/linux/generic/patches-3.8/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
-@@ -1246,7 +1246,7 @@ out:
+@@ -1243,7 +1243,7 @@ out:
return ret;
}
@@ -41,7 +41,7 @@
const struct in6_addr *daddr, unsigned int prefs,
struct in6_addr *saddr)
{
-@@ -1371,7 +1371,6 @@ try_nextdev:
+@@ -1368,7 +1368,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)
-@@ -4949,6 +4948,9 @@ int __init addrconf_init(void)
+@@ -4946,6 +4945,9 @@ int __init addrconf_init(void)
ipv6_addr_label_rtnl_register();
@@ -59,7 +59,7 @@
return 0;
errout:
rtnl_af_unregister(&inet6_ops);
-@@ -4967,6 +4969,9 @@ void addrconf_cleanup(void)
+@@ -4964,6 +4966,9 @@ void addrconf_cleanup(void)
struct net_device *dev;
int i;