diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2014-03-26 14:14:20 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2014-03-26 14:14:20 +0000 |
| commit | 132f7d3cc9ed2d2587214b4f5e7aced259dc223f (patch) | |
| tree | 37811c5a731a1c991753037c70a3a1a15b4a2222 /target/linux/generic/patches-3.14/643-bridge_remove_ipv6_dependency.patch | |
| parent | b8e295aa7b5c4fcc4c0de34af8e04b39ac871d18 (diff) | |
| download | upstream-132f7d3cc9ed2d2587214b4f5e7aced259dc223f.tar.gz upstream-132f7d3cc9ed2d2587214b4f5e7aced259dc223f.tar.bz2 upstream-132f7d3cc9ed2d2587214b4f5e7aced259dc223f.zip | |
update to 3.14-rc8
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
SVN-Revision: 40023
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.patch | 8 |
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 5cf3febd56..2d807431d6 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 -@@ -1304,7 +1304,7 @@ out: +@@ -1307,7 +1307,7 @@ out: return ret; } @@ -41,7 +41,7 @@ const struct in6_addr *daddr, unsigned int prefs, struct in6_addr *saddr) { -@@ -1429,7 +1429,6 @@ try_nextdev: +@@ -1432,7 +1432,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) -@@ -5294,6 +5293,9 @@ int __init addrconf_init(void) +@@ -5297,6 +5296,9 @@ int __init addrconf_init(void) ipv6_addr_label_rtnl_register(); @@ -59,7 +59,7 @@ return 0; errout: rtnl_af_unregister(&inet6_ops); -@@ -5311,6 +5313,9 @@ void addrconf_cleanup(void) +@@ -5314,6 +5316,9 @@ void addrconf_cleanup(void) struct net_device *dev; int i; |