kernel: update 3.10 to 3.10.9

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

diff --git a/target/linux/generic/patches-3.10/643-bridge_remove_ipv6_dependency.patch b/target/linux/generic/patches-3.10/643-bridge_remove_ipv6_dependency.patch
index 3d3c625..5f88e6b 100644 (file)
--- a/target/linux/generic/patches-3.10/643-bridge_remove_ipv6_dependency.patch
+++ b/target/linux/generic/patches-3.10/643-bridge_remove_ipv6_dependency.patch
@@ -1,6 +1,6 @@
 --- a/include/net/addrconf.h
 +++ b/include/net/addrconf.h
-@@ -96,6 +96,12 @@ extern void                 addrconf_join_solict(struc
+@@ -99,6 +99,12 @@ extern void                 addrconf_join_solict(struc
  extern void                   addrconf_leave_solict(struct inet6_dev *idev,
                                        const struct in6_addr *addr);
  
@@ -47,9 +47,9 @@
  }
 -EXPORT_SYMBOL(ipv6_dev_get_saddr);
  
- int ipv6_get_lladdr(struct net_device *dev, struct in6_addr *addr,
-                   unsigned char banned_flags)
-@@ -5137,6 +5136,9 @@ int __init addrconf_init(void)
+ int __ipv6_get_lladdr(struct inet6_dev *idev, struct in6_addr *addr,
+                     unsigned char banned_flags)
+@@ -5145,6 +5144,9 @@ int __init addrconf_init(void)
  
        ipv6_addr_label_rtnl_register();
  
@@ -59,7 +59,7 @@
        return 0;
  errout:
        rtnl_af_unregister(&inet6_ops);
-@@ -5155,6 +5157,9 @@ void addrconf_cleanup(void)
+@@ -5163,6 +5165,9 @@ void addrconf_cleanup(void)
        struct net_device *dev;
        int i;