generic: backport a fix for the input keymap-matrix module

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

diff --git a/target/linux/generic/patches-3.6/643-bridge_remove_ipv6_dependency.patch b/target/linux/generic/patches-3.6/643-bridge_remove_ipv6_dependency.patch
index 301b6be44197c09a775c28a630e9ba15664fe1c8..5bf629b5e4617a34b9fb9bfed97ceed8f8053537 100644 (file)
--- a/target/linux/generic/patches-3.6/643-bridge_remove_ipv6_dependency.patch
+++ b/target/linux/generic/patches-3.6/643-bridge_remove_ipv6_dependency.patch
@@ -1,6 +1,6 @@
 --- a/include/net/addrconf.h
 +++ b/include/net/addrconf.h
-@@ -91,6 +91,12 @@ extern void                 addrconf_join_solict(struc
+@@ -92,6 +92,12 @@ extern void                 addrconf_join_solict(struc
  extern void                   addrconf_leave_solict(struct inet6_dev *idev,
                                        const struct in6_addr *addr);
  
@@ -11,7 +11,7 @@
 +                                              struct in6_addr *saddr);
 +
  static inline unsigned long addrconf_timeout_fixup(u32 timeout,
-                                                   unsigned unit)
+                                                  unsigned int unit)
  {
 --- a/net/bridge/Kconfig
 +++ b/net/bridge/Kconfig
@@ -32,7 +32,7 @@
 +obj-$(subst m,y,$(CONFIG_IPV6)) += inet6_stubs.o
 --- a/net/ipv6/addrconf.c
 +++ b/net/ipv6/addrconf.c
-@@ -1103,7 +1103,7 @@ out:
+@@ -1099,7 +1099,7 @@ out:
        return ret;
  }
  
@@ -41,7 +41,7 @@
                       const struct in6_addr *daddr, unsigned int prefs,
                       struct in6_addr *saddr)
  {
-@@ -1228,7 +1228,6 @@ try_nextdev:
+@@ -1224,7 +1224,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)
-@@ -4840,6 +4839,9 @@ int __init addrconf_init(void)
+@@ -4811,6 +4810,9 @@ int __init addrconf_init(void)
  
        ipv6_addr_label_rtnl_register();
  
@@ -59,7 +59,7 @@
        return 0;
  errout:
        rtnl_af_unregister(&inet6_ops);
-@@ -4858,6 +4860,9 @@ void addrconf_cleanup(void)
+@@ -4829,6 +4831,9 @@ void addrconf_cleanup(void)
        struct net_device *dev;
        int i;