summaryrefslogtreecommitdiff
path: root/target/linux/generic/patches-3.14/643-bridge_remove_ipv6_dependency.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/generic/patches-3.14/643-bridge_remove_ipv6_dependency.patch')
-rw-r--r--target/linux/generic/patches-3.14/643-bridge_remove_ipv6_dependency.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/patches-3.14/643-bridge_remove_ipv6_dependency.patch b/target/linux/generic/patches-3.14/643-bridge_remove_ipv6_dependency.patch
index 2d80743..5b2a731 100644
--- a/target/linux/generic/patches-3.14/643-bridge_remove_ipv6_dependency.patch
+++ b/target/linux/generic/patches-3.14/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
-@@ -1307,7 +1307,7 @@ out:
+@@ -1311,7 +1311,7 @@ out:
return ret;
}
@@ -41,7 +41,7 @@
const struct in6_addr *daddr, unsigned int prefs,
struct in6_addr *saddr)
{
-@@ -1432,7 +1432,6 @@ try_nextdev:
+@@ -1436,7 +1436,6 @@ try_nextdev:
in6_ifa_put(hiscore->ifa);
return 0;
}
@@ -49,7 +49,7 @@
int __ipv6_get_lladdr(struct inet6_dev *idev, struct in6_addr *addr,
u32 banned_flags)
-@@ -5297,6 +5296,9 @@ int __init addrconf_init(void)
+@@ -5385,6 +5384,9 @@ int __init addrconf_init(void)
ipv6_addr_label_rtnl_register();
@@ -59,7 +59,7 @@
return 0;
errout:
rtnl_af_unregister(&inet6_ops);
-@@ -5314,6 +5316,9 @@ void addrconf_cleanup(void)
+@@ -5404,6 +5406,9 @@ void addrconf_cleanup(void)
struct net_device *dev;
int i;