From e07848664cc6f70d3ee6b66257aa6f475a461338 Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Fri, 19 Apr 2013 08:07:37 +0000 Subject: [PATCH] linux/3.[89]: update bridge_remove_ipv6_dependency patch 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 SVN-Revision: 36364 --- .../643-bridge_remove_ipv6_dependency.patch | 10 +++++----- .../643-bridge_remove_ipv6_dependency.patch | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) 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 5c60d1347b..f4aafca45c 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, @@ -81,13 +81,13 @@ +#include +#include + -+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) +{ diff --git a/target/linux/generic/patches-3.9/643-bridge_remove_ipv6_dependency.patch b/target/linux/generic/patches-3.9/643-bridge_remove_ipv6_dependency.patch index 7410a08abc..aac820039b 100644 --- a/target/linux/generic/patches-3.9/643-bridge_remove_ipv6_dependency.patch +++ b/target/linux/generic/patches-3.9/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, @@ -81,13 +81,13 @@ +#include +#include + -+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) +{ -- 2.30.2