KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

linux/3.[89]: update bridge_remove_ipv6_dependency patch

Browse source 
Fixes the following warning:

    CC [M]  net/ipv6/addrconf.o
  net/ipv6/addrconf.c: In function 'addrconf_init':
  net/ipv6/addrconf.c:4944:2: warning: assignment from incompatible pointer type [enabled by default]

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 36364
This commit is contained in:
Gabor Juhos 2013-04-19 08:07:37 +00:00
parent 151cadfe32
commit e07848664c
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
target/linux/generic/patches-3.8/643-bridge_remove_ipv6_dependency.patch
View file

@ -5,9 +5,9 @@
const struct in6_addr *addr); const struct in6_addr *addr);
+extern int (*ipv6_dev_get_saddr_hook)(struct net *net, +extern int (*ipv6_dev_get_saddr_hook)(struct net *net,
+ struct net_device *dev, + const struct net_device *dev,
+ const struct in6_addr *daddr, + const struct in6_addr *daddr,
+ unsigned int srcprefs, + unsigned int prefs,
+ struct in6_addr *saddr); + struct in6_addr *saddr);
+ +
static inline unsigned long addrconf_timeout_fixup(u32 timeout, static inline unsigned long addrconf_timeout_fixup(u32 timeout,
@ -81,13 +81,13 @@
+#include <linux/export.h> +#include <linux/export.h>
+#include <net/ipv6.h> +#include <net/ipv6.h>
+ +
+int (*ipv6_dev_get_saddr_hook)(struct net *net, struct net_device *dev, +int (*ipv6_dev_get_saddr_hook)(struct net *net, const struct net_device *dev,
+ const struct in6_addr *daddr, unsigned int srcprefs, + const struct in6_addr *daddr, unsigned int prefs,
+ struct in6_addr *saddr); + struct in6_addr *saddr);
+ +
+EXPORT_SYMBOL(ipv6_dev_get_saddr_hook); +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, + const struct in6_addr *daddr, unsigned int prefs,
+ struct in6_addr *saddr) + struct in6_addr *saddr)
+{ +{

10
target/linux/generic/patches-3.9/643-bridge_remove_ipv6_dependency.patch
View file

@ -5,9 +5,9 @@
const struct in6_addr *addr); const struct in6_addr *addr);
+extern int (*ipv6_dev_get_saddr_hook)(struct net *net, +extern int (*ipv6_dev_get_saddr_hook)(struct net *net,
+ struct net_device *dev, + const struct net_device *dev,
+ const struct in6_addr *daddr, + const struct in6_addr *daddr,
+ unsigned int srcprefs, + unsigned int prefs,
+ struct in6_addr *saddr); + struct in6_addr *saddr);
+ +
static inline unsigned long addrconf_timeout_fixup(u32 timeout, static inline unsigned long addrconf_timeout_fixup(u32 timeout,
@ -81,13 +81,13 @@
+#include <linux/export.h> +#include <linux/export.h>
+#include <net/ipv6.h> +#include <net/ipv6.h>
+ +
+int (*ipv6_dev_get_saddr_hook)(struct net *net, struct net_device *dev, +int (*ipv6_dev_get_saddr_hook)(struct net *net, const struct net_device *dev,
+ const struct in6_addr *daddr, unsigned int srcprefs, + const struct in6_addr *daddr, unsigned int prefs,
+ struct in6_addr *saddr); + struct in6_addr *saddr);
+ +
+EXPORT_SYMBOL(ipv6_dev_get_saddr_hook); +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, + const struct in6_addr *daddr, unsigned int prefs,
+ struct in6_addr *saddr) + struct in6_addr *saddr)
+{ +{