X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fstaging%2Fyousong.git;a=blobdiff_plain;f=target%2Flinux%2Fgeneric%2Fpatches-3.8%2F643-bridge_remove_ipv6_dependency.patch;h=9fad8b991a3f54447a862362325b6a924f25f43e;hp=a1563f44e78a45c0468d9edd2d9e6b0760249e9b;hb=3600b84cbd9696496d3a7862f003d839c177d088;hpb=8dbed04ec9cad7771590af557b9edfe8e04bca8c;ds=sidebyside

diff --git a/target/linux/generic/patches-3.8/643-bridge_remove_ipv6_dependency.patch b/target/linux/generic/patches-3.8/643-bridge_remove_ipv6_dependency.patch
index a1563f44e7..9fad8b991a 100644
--- a/target/linux/generic/patches-3.8/643-bridge_remove_ipv6_dependency.patch
+++ b/target/linux/generic/patches-3.8/643-bridge_remove_ipv6_dependency.patch
@@ -5,9 +5,9 @@
  					const struct in6_addr *addr);
  
 +extern int			(*ipv6_dev_get_saddr_hook)(struct net *net,
-+						struct net_device *dev,
++						const struct net_device *dev,
 +						const struct in6_addr *daddr,
-+						unsigned int srcprefs,
++						unsigned int prefs,
 +						struct in6_addr *saddr);
 +
  static inline unsigned long addrconf_timeout_fixup(u32 timeout,
@@ -32,7 +32,7 @@
 +obj-$(subst m,y,$(CONFIG_IPV6)) += inet6_stubs.o
 --- a/net/ipv6/addrconf.c
 +++ b/net/ipv6/addrconf.c
-@@ -1246,7 +1246,7 @@ out:
+@@ -1243,7 +1243,7 @@ out:
  	return ret;
  }
  
@@ -41,7 +41,7 @@
  		       const struct in6_addr *daddr, unsigned int prefs,
  		       struct in6_addr *saddr)
  {
-@@ -1371,7 +1371,6 @@ try_nextdev:
+@@ -1368,7 +1368,6 @@ try_nextdev:
  	in6_ifa_put(hiscore->ifa);
  	return 0;
  }
@@ -49,7 +49,7 @@
  
  int ipv6_get_lladdr(struct net_device *dev, struct in6_addr *addr,
  		    unsigned char banned_flags)
-@@ -4949,6 +4948,9 @@ int __init addrconf_init(void)
+@@ -4968,6 +4967,9 @@ int __init addrconf_init(void)
  
  	ipv6_addr_label_rtnl_register();
  
@@ -59,7 +59,7 @@
  	return 0;
  errout:
  	rtnl_af_unregister(&inet6_ops);
-@@ -4967,6 +4969,9 @@ void addrconf_cleanup(void)
+@@ -4986,6 +4988,9 @@ void addrconf_cleanup(void)
  	struct net_device *dev;
  	int i;
  
@@ -81,13 +81,13 @@
 +#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,
++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, struct net_device *dst_dev,
++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)
 +{