kernel: update 3.10 to 3.10.12

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 38000
This commit is contained in:
Gabor Juhos
2013-09-15 16:00:41 +00:00
parent 57c6730ed6
commit 554772a665
39 changed files with 64 additions and 117 deletions

View File

@@ -32,7 +32,7 @@
+obj-$(subst m,y,$(CONFIG_IPV6)) += inet6_stubs.o
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -1321,7 +1321,7 @@ out:
@@ -1319,7 +1319,7 @@ out:
return ret;
}
@@ -41,7 +41,7 @@
const struct in6_addr *daddr, unsigned int prefs,
struct in6_addr *saddr)
{
@@ -1446,7 +1446,6 @@ try_nextdev:
@@ -1444,7 +1444,6 @@ try_nextdev:
in6_ifa_put(hiscore->ifa);
return 0;
}
@@ -49,7 +49,7 @@
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)
@@ -5143,6 +5142,9 @@ int __init addrconf_init(void)
ipv6_addr_label_rtnl_register();
@@ -59,7 +59,7 @@
return 0;
errout:
rtnl_af_unregister(&inet6_ops);
@@ -5163,6 +5165,9 @@ void addrconf_cleanup(void)
@@ -5161,6 +5163,9 @@ void addrconf_cleanup(void)
struct net_device *dev;
int i;