aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-4.0/643-bridge_remove_ipv6_dependency.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-03-18 18:21:08 +0000
committerFelix Fietkau <nbd@openwrt.org>2015-03-18 18:21:08 +0000
commit5d4be21553ddc62ac97b9698c656829d7e814ee1 (patch)
tree96d2c11b857e6ec2cd443a6bb5cc76239994c1f9 /target/linux/generic/patches-4.0/643-bridge_remove_ipv6_dependency.patch
parent5abe49b74ed399880c9f16e0fac2e1a2b302f9d7 (diff)
downloadmaster-187ad058-5d4be21553ddc62ac97b9698c656829d7e814ee1.tar.gz
master-187ad058-5d4be21553ddc62ac97b9698c656829d7e814ee1.tar.bz2
master-187ad058-5d4be21553ddc62ac97b9698c656829d7e814ee1.zip
kernel: bump to 3.14.35, 3.18.9, 3.19.1 and 4.0-rc4
also refresh generic patches for 3.14, 3.18, 3.19 and 4.0 targets might need a minor refresh as well, however, it looks like everything still applies cleanly with occasional small offsets. Signed-off-by: Daniel Golle <daniel@makrotopia.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44876 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-4.0/643-bridge_remove_ipv6_dependency.patch')
-rw-r--r--target/linux/generic/patches-4.0/643-bridge_remove_ipv6_dependency.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-4.0/643-bridge_remove_ipv6_dependency.patch b/target/linux/generic/patches-4.0/643-bridge_remove_ipv6_dependency.patch
index f0c373cc41..50e4fe4b10 100644
--- a/target/linux/generic/patches-4.0/643-bridge_remove_ipv6_dependency.patch
+++ b/target/linux/generic/patches-4.0/643-bridge_remove_ipv6_dependency.patch
@@ -52,7 +52,7 @@
int __ipv6_get_lladdr(struct inet6_dev *idev, struct in6_addr *addr,
u32 banned_flags)
-@@ -5524,6 +5523,9 @@ int __init addrconf_init(void)
+@@ -5539,6 +5538,9 @@ int __init addrconf_init(void)
ipv6_addr_label_rtnl_register();
@@ -62,7 +62,7 @@
return 0;
errout:
rtnl_af_unregister(&inet6_ops);
-@@ -5543,6 +5545,9 @@ void addrconf_cleanup(void)
+@@ -5558,6 +5560,9 @@ void addrconf_cleanup(void)
struct net_device *dev;
int i;