diff options
author | Luka Perkov <luka@openwrt.org> | 2015-04-11 10:28:14 +0000 |
---|---|---|
committer | Luka Perkov <luka@openwrt.org> | 2015-04-11 10:28:14 +0000 |
commit | 4398ecd73dcf8554c0e495de082e4677440c1d5c (patch) | |
tree | e24faee648bd7fe02dcdb4a9f916f88324797735 /target/linux/generic/patches-3.14/643-bridge_remove_ipv6_dependency.patch | |
parent | adb7aa14be1321e4ee57b2564edeb558d7eedcda (diff) | |
download | master-187ad058-4398ecd73dcf8554c0e495de082e4677440c1d5c.tar.gz master-187ad058-4398ecd73dcf8554c0e495de082e4677440c1d5c.tar.bz2 master-187ad058-4398ecd73dcf8554c0e495de082e4677440c1d5c.zip |
generic: drop 3.14
Signed-off-by: Luka Perkov <luka@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45375 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.patch | 107 |
1 files changed, 0 insertions, 107 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 deleted file mode 100644 index e6721defbd..0000000000 --- a/target/linux/generic/patches-3.14/643-bridge_remove_ipv6_dependency.patch +++ /dev/null @@ -1,107 +0,0 @@ ---- a/include/net/addrconf.h -+++ b/include/net/addrconf.h -@@ -88,6 +88,12 @@ int ipv6_rcv_saddr_equal(const struct so - void addrconf_join_solict(struct net_device *dev, const struct in6_addr *addr); - void addrconf_leave_solict(struct inet6_dev *idev, const struct in6_addr *addr); - -+extern int (*ipv6_dev_get_saddr_hook)(struct net *net, -+ const struct net_device *dev, -+ const struct in6_addr *daddr, -+ unsigned int prefs, -+ struct in6_addr *saddr); -+ - static inline unsigned long addrconf_timeout_fixup(u32 timeout, - unsigned int unit) - { ---- a/net/bridge/Kconfig -+++ b/net/bridge/Kconfig -@@ -6,7 +6,6 @@ config BRIDGE - tristate "802.1d Ethernet Bridging" - select LLC - select STP -- depends on IPV6 || IPV6=n - ---help--- - If you say Y here, then your Linux box will be able to act as an - Ethernet bridge, which means that the different Ethernet segments it ---- a/net/ipv6/Makefile -+++ b/net/ipv6/Makefile -@@ -45,3 +45,4 @@ obj-y += addrconf_core.o exthdrs_core.o - obj-$(CONFIG_INET) += output_core.o protocol.o $(ipv6-offload) - - obj-$(subst m,y,$(CONFIG_IPV6)) += inet6_hashtables.o -+obj-$(subst m,y,$(CONFIG_IPV6)) += inet6_stubs.o ---- a/net/ipv6/addrconf.c -+++ b/net/ipv6/addrconf.c -@@ -1311,7 +1311,7 @@ out: - return ret; - } - --int ipv6_dev_get_saddr(struct net *net, const struct net_device *dst_dev, -+static int __ipv6_dev_get_saddr(struct net *net, const struct net_device *dst_dev, - const struct in6_addr *daddr, unsigned int prefs, - struct in6_addr *saddr) - { -@@ -1436,7 +1436,6 @@ try_nextdev: - in6_ifa_put(hiscore->ifa); - return 0; - } --EXPORT_SYMBOL(ipv6_dev_get_saddr); - - int __ipv6_get_lladdr(struct inet6_dev *idev, struct in6_addr *addr, - u32 banned_flags) -@@ -5380,6 +5379,9 @@ int __init addrconf_init(void) - - ipv6_addr_label_rtnl_register(); - -+ BUG_ON(ipv6_dev_get_saddr_hook != NULL); -+ rcu_assign_pointer(ipv6_dev_get_saddr_hook, __ipv6_dev_get_saddr); -+ - return 0; - errout: - rtnl_af_unregister(&inet6_ops); -@@ -5399,6 +5401,9 @@ void addrconf_cleanup(void) - struct net_device *dev; - int i; - -+ rcu_assign_pointer(ipv6_dev_get_saddr_hook, NULL); -+ synchronize_rcu(); -+ - unregister_netdevice_notifier(&ipv6_dev_notf); - unregister_pernet_subsys(&addrconf_ops); - ipv6_addr_label_cleanup(); ---- /dev/null -+++ b/net/ipv6/inet6_stubs.c -@@ -0,0 +1,33 @@ -+/* -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License -+ * as published by the Free Software Foundation; either version -+ * 2 of the License, or (at your option) any later version. -+ */ -+#include <linux/export.h> -+#include <net/ipv6.h> -+ -+int (*ipv6_dev_get_saddr_hook)(struct net *net, const struct net_device *dev, -+ const struct in6_addr *daddr, unsigned int prefs, -+ struct in6_addr *saddr); -+ -+EXPORT_SYMBOL(ipv6_dev_get_saddr_hook); -+ -+int ipv6_dev_get_saddr(struct net *net, const struct net_device *dst_dev, -+ const struct in6_addr *daddr, unsigned int prefs, -+ struct in6_addr *saddr) -+{ -+ int ret = -EADDRNOTAVAIL; -+ typeof(ipv6_dev_get_saddr_hook) dev_get_saddr; -+ -+ rcu_read_lock(); -+ dev_get_saddr = rcu_dereference(ipv6_dev_get_saddr_hook); -+ -+ if (dev_get_saddr) -+ ret = dev_get_saddr(net, dst_dev, daddr, prefs, saddr); -+ -+ rcu_read_unlock(); -+ return ret; -+} -+EXPORT_SYMBOL(ipv6_dev_get_saddr); -+ |