summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-04-19 08:07:37 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-04-19 08:07:37 +0000
commit17fbf1649392382e0a93b591476794ef375d592d (patch)
tree69b3c999b4b0801ed9f95d777f6dbdea260f4bc9
parentc1f980f9b354fcca28d2d380067bd18cb4a31383 (diff)
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 <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36364 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/generic/patches-3.8/643-bridge_remove_ipv6_dependency.patch10
-rw-r--r--target/linux/generic/patches-3.9/643-bridge_remove_ipv6_dependency.patch10
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 5c60d1347..f4aafca45 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 <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)
+{
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 7410a08ab..aac820039 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 <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)
+{