kernel: bcma: update to wireless-testing master-2013-10-01

[openwrt.git] / target / linux / generic / patches-3.9 / 643-bridge_remove_ipv6_dependency.patch

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 6193aa970424f1b2b7e38cf3f3ee971cdbf7ebcd..c42c57ccf78283062bc4692fad992469a8aecc57 100644 (file)
--- 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,
@@ -32,7 +32,7 @@
 +obj-$(subst m,y,$(CONFIG_IPV6)) += inet6_stubs.o
 --- a/net/ipv6/addrconf.c
 +++ b/net/ipv6/addrconf.c
-@@ -1250,7 +1250,7 @@ out:
+@@ -1248,7 +1248,7 @@ out:
        return ret;
  }
  
@@ -41,7 +41,7 @@
                       const struct in6_addr *daddr, unsigned int prefs,
                       struct in6_addr *saddr)
  {
-@@ -1375,7 +1375,6 @@ try_nextdev:
+@@ -1373,7 +1373,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)
-@@ -4944,6 +4943,9 @@ int __init addrconf_init(void)
+@@ -4949,6 +4948,9 @@ int __init addrconf_init(void)
  
        ipv6_addr_label_rtnl_register();
  
@@ -59,7 +59,7 @@
        return 0;
  errout:
        rtnl_af_unregister(&inet6_ops);
-@@ -4962,6 +4964,9 @@ void addrconf_cleanup(void)
+@@ -4967,6 +4969,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)
 +{