diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2016-03-03 22:28:12 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2016-03-03 22:28:12 +0000 |
| commit | 5ce6da3d7a65968c6c82b75c31009b0f7bcf528e (patch) | |
| tree | 97c5c16b260853f6c026fe0abfcc8e17440ebad5 /target/linux/generic/patches-3.18/643-bridge_remove_ipv6_dependency.patch | |
| parent | 124c1ca86a3c7745555636d67e3d99ad75b07aed (diff) | |
| download | upstream-5ce6da3d7a65968c6c82b75c31009b0f7bcf528e.tar.gz upstream-5ce6da3d7a65968c6c82b75c31009b0f7bcf528e.tar.bz2 upstream-5ce6da3d7a65968c6c82b75c31009b0f7bcf528e.zip | |
CC: kernel: update kernel 3.18 to version 3.18.27
Changelog:
* https://cdn.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.24
* https://cdn.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.25
* https://cdn.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.26
* https://cdn.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.27
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48896 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.18/643-bridge_remove_ipv6_dependency.patch')
| -rw-r--r-- | target/linux/generic/patches-3.18/643-bridge_remove_ipv6_dependency.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/patches-3.18/643-bridge_remove_ipv6_dependency.patch b/target/linux/generic/patches-3.18/643-bridge_remove_ipv6_dependency.patch index 3f0dcd3ae2..aef3832b0f 100644 --- a/target/linux/generic/patches-3.18/643-bridge_remove_ipv6_dependency.patch +++ b/target/linux/generic/patches-3.18/643-bridge_remove_ipv6_dependency.patch @@ -35,7 +35,7 @@ obj-$(CONFIG_NET_UDP_TUNNEL) += ip6_udp_tunnel.o --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c -@@ -1317,7 +1317,7 @@ out: +@@ -1318,7 +1318,7 @@ out: return ret; } @@ -44,7 +44,7 @@ const struct in6_addr *daddr, unsigned int prefs, struct in6_addr *saddr) { -@@ -1442,7 +1442,6 @@ try_nextdev: +@@ -1443,7 +1443,6 @@ try_nextdev: in6_ifa_put(hiscore->ifa); return 0; } @@ -52,7 +52,7 @@ int __ipv6_get_lladdr(struct inet6_dev *idev, struct in6_addr *addr, u32 banned_flags) -@@ -5451,6 +5450,9 @@ int __init addrconf_init(void) +@@ -5467,6 +5466,9 @@ int __init addrconf_init(void) ipv6_addr_label_rtnl_register(); @@ -62,7 +62,7 @@ return 0; errout: rtnl_af_unregister(&inet6_ops); -@@ -5470,6 +5472,9 @@ void addrconf_cleanup(void) +@@ -5486,6 +5488,9 @@ void addrconf_cleanup(void) struct net_device *dev; int i; |