brcm47xx: update flash drivers

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

diff --git a/target/linux/generic/patches-3.3/643-bridge_remove_ipv6_dependency.patch b/target/linux/generic/patches-3.3/643-bridge_remove_ipv6_dependency.patch
index 1ca8979..301b6be 100644 (file)
--- a/target/linux/generic/patches-3.3/643-bridge_remove_ipv6_dependency.patch
+++ b/target/linux/generic/patches-3.3/643-bridge_remove_ipv6_dependency.patch
@@ -32,7 +32,7 @@
 +obj-$(subst m,y,$(CONFIG_IPV6)) += inet6_stubs.o
 --- a/net/ipv6/addrconf.c
 +++ b/net/ipv6/addrconf.c
 +obj-$(subst m,y,$(CONFIG_IPV6)) += inet6_stubs.o
 --- a/net/ipv6/addrconf.c
 +++ b/net/ipv6/addrconf.c

-@@ -1099,7 +1099,7 @@ out:
+@@ -1103,7 +1103,7 @@ out:

        return ret;
  }
  
        return ret;
  }
  


@@ -41,7 +41,7 @@
                       const struct in6_addr *daddr, unsigned int prefs,
                       struct in6_addr *saddr)
  {
                       const struct in6_addr *daddr, unsigned int prefs,
                       struct in6_addr *saddr)
  {

-@@ -1224,7 +1224,6 @@ try_nextdev:
+@@ -1228,7 +1228,6 @@ try_nextdev:

        in6_ifa_put(hiscore->ifa);
        return 0;
  }
        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)
  
  int ipv6_get_lladdr(struct net_device *dev, struct in6_addr *addr,
                    unsigned char banned_flags)

-@@ -4836,6 +4835,9 @@ int __init addrconf_init(void)
+@@ -4840,6 +4839,9 @@ int __init addrconf_init(void)

  
        ipv6_addr_label_rtnl_register();
  
  
        ipv6_addr_label_rtnl_register();
  


@@ -59,7 +59,7 @@
        return 0;
  errout:
        rtnl_af_unregister(&inet6_ops);
        return 0;
  errout:
        rtnl_af_unregister(&inet6_ops);

-@@ -4854,6 +4856,9 @@ void addrconf_cleanup(void)
+@@ -4858,6 +4860,9 @@ void addrconf_cleanup(void)

        struct net_device *dev;
        int i;
  
        struct net_device *dev;
        int i;