diff options
author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-05-27 15:01:37 +0000 |
---|---|---|
committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-05-27 15:01:37 +0000 |
commit | fe77f5d92219c04614c22fd46d1c521dfe72cd7b (patch) | |
tree | c3e80a16d0b4070af1ea473d644981d1df410c54 /target/linux/generic/patches-3.2/643-bridge_remove_ipv6_dependency.patch | |
parent | 1ee6958324f44923ed309d2fa911fc432f514694 (diff) |
linux/3.2: R.I.P.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31905 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.2/643-bridge_remove_ipv6_dependency.patch')
-rw-r--r-- | target/linux/generic/patches-3.2/643-bridge_remove_ipv6_dependency.patch | 107 |
1 files changed, 0 insertions, 107 deletions
diff --git a/target/linux/generic/patches-3.2/643-bridge_remove_ipv6_dependency.patch b/target/linux/generic/patches-3.2/643-bridge_remove_ipv6_dependency.patch deleted file mode 100644 index 6b79e5463d..0000000000 --- a/target/linux/generic/patches-3.2/643-bridge_remove_ipv6_dependency.patch +++ /dev/null @@ -1,107 +0,0 @@ ---- a/include/net/addrconf.h -+++ b/include/net/addrconf.h -@@ -91,6 +91,12 @@ extern void addrconf_join_solict(struc - extern void addrconf_leave_solict(struct inet6_dev *idev, - const struct in6_addr *addr); - -+extern int (*ipv6_dev_get_saddr_hook)(struct net *net, -+ struct net_device *dev, -+ const struct in6_addr *daddr, -+ unsigned int srcprefs, -+ struct in6_addr *saddr); -+ - static inline unsigned long addrconf_timeout_fixup(u32 timeout, - unsigned 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 -@@ -40,3 +40,4 @@ obj-$(CONFIG_IPV6_TUNNEL) += ip6_tunnel. - obj-y += addrconf_core.o exthdrs_core.o - - 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 -@@ -1111,7 +1111,7 @@ out: - return ret; - } - --int ipv6_dev_get_saddr(struct net *net, struct net_device *dst_dev, -+static int __ipv6_dev_get_saddr(struct net *net, struct net_device *dst_dev, - const struct in6_addr *daddr, unsigned int prefs, - struct in6_addr *saddr) - { -@@ -1236,7 +1236,6 @@ try_nextdev: - in6_ifa_put(hiscore->ifa); - return 0; - } --EXPORT_SYMBOL(ipv6_dev_get_saddr); - - int ipv6_get_lladdr(struct net_device *dev, struct in6_addr *addr, - unsigned char banned_flags) -@@ -4818,6 +4817,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); -@@ -4836,6 +4838,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, struct net_device *dev, -+ const struct in6_addr *daddr, unsigned int srcprefs, -+ struct in6_addr *saddr); -+ -+EXPORT_SYMBOL(ipv6_dev_get_saddr_hook); -+ -+int ipv6_dev_get_saddr(struct net *net, 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); -+ |