aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.14/643-bridge_remove_ipv6_dependency.patch
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2014-11-29 10:30:58 +0000
committerLuka Perkov <luka@openwrt.org>2014-11-29 10:30:58 +0000
commit15a48a38b8ea48596667ef340a7d263fe74fbaa0 (patch)
treeb7feb2c8ab6c41b9e49a14d5202072ae11f53e49 /target/linux/generic/patches-3.14/643-bridge_remove_ipv6_dependency.patch
parent5685e23f48e1f2c4ce44b3328a431b79bab85e41 (diff)
downloadupstream-15a48a38b8ea48596667ef340a7d263fe74fbaa0.tar.gz
upstream-15a48a38b8ea48596667ef340a7d263fe74fbaa0.tar.bz2
upstream-15a48a38b8ea48596667ef340a7d263fe74fbaa0.zip
kernel: update 3.14 to 3.14.25
Signed-off-by: Luka Perkov <luka@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43427 3c298f89-4303-0410-b956-a3cf2f4a3e73
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.patch4
1 files changed, 2 insertions, 2 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 5b2a7318c7..e6721defbd 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
@@ -49,7 +49,7 @@
int __ipv6_get_lladdr(struct inet6_dev *idev, struct in6_addr *addr,
u32 banned_flags)
-@@ -5385,6 +5384,9 @@ int __init addrconf_init(void)
+@@ -5380,6 +5379,9 @@ int __init addrconf_init(void)
ipv6_addr_label_rtnl_register();
@@ -59,7 +59,7 @@
return 0;
errout:
rtnl_af_unregister(&inet6_ops);
-@@ -5404,6 +5406,9 @@ void addrconf_cleanup(void)
+@@ -5399,6 +5401,9 @@ void addrconf_cleanup(void)
struct net_device *dev;
int i;