summaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.2/643-bridge_remove_ipv6_dependency.patch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2012-03-19 18:23:31 +0000
committerGabor Juhos <juhosg@openwrt.org>2012-03-19 18:23:31 +0000
commitc1dc6df8bd19306f1b7981cc28618bb8ffce8697 (patch)
treee9bfa33203f0a4f3484fad690bb2626e7438ff15 /target/linux/generic/patches-3.2/643-bridge_remove_ipv6_dependency.patch
parentf86e4123891689ddfd3b6112ac3dacaefeb5a536 (diff)
downloadmaster-31e0f0ae-c1dc6df8bd19306f1b7981cc28618bb8ffce8697.tar.gz
master-31e0f0ae-c1dc6df8bd19306f1b7981cc28618bb8ffce8697.tar.bz2
master-31e0f0ae-c1dc6df8bd19306f1b7981cc28618bb8ffce8697.zip
kernel: update linux 3.2 to 3.2.12
SVN-Revision: 31028
Diffstat (limited to 'target/linux/generic/patches-3.2/643-bridge_remove_ipv6_dependency.patch')
-rw-r--r--target/linux/generic/patches-3.2/643-bridge_remove_ipv6_dependency.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/patches-3.2/643-bridge_remove_ipv6_dependency.patch b/target/linux/generic/patches-3.2/643-bridge_remove_ipv6_dependency.patch
index 9203e01742..6b79e5463d 100644
--- a/target/linux/generic/patches-3.2/643-bridge_remove_ipv6_dependency.patch
+++ b/target/linux/generic/patches-3.2/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
-@@ -1107,7 +1107,7 @@ out:
+@@ -1111,7 +1111,7 @@ out:
return ret;
}
@@ -41,7 +41,7 @@
const struct in6_addr *daddr, unsigned int prefs,
struct in6_addr *saddr)
{
-@@ -1232,7 +1232,6 @@ try_nextdev:
+@@ -1236,7 +1236,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)
-@@ -4814,6 +4813,9 @@ int __init addrconf_init(void)
+@@ -4818,6 +4817,9 @@ int __init addrconf_init(void)
ipv6_addr_label_rtnl_register();
@@ -59,7 +59,7 @@
return 0;
errout:
rtnl_af_unregister(&inet6_ops);
-@@ -4832,6 +4834,9 @@ void addrconf_cleanup(void)
+@@ -4836,6 +4838,9 @@ void addrconf_cleanup(void)
struct net_device *dev;
int i;