|
|
@ -32,7 +32,7 @@ |
|
|
|
+obj-$(subst m,y,$(CONFIG_IPV6)) += inet6_stubs.o
|
|
|
|
+obj-$(subst m,y,$(CONFIG_IPV6)) += inet6_stubs.o
|
|
|
|
--- a/net/ipv6/addrconf.c
|
|
|
|
--- a/net/ipv6/addrconf.c
|
|
|
|
+++ b/net/ipv6/addrconf.c
|
|
|
|
+++ b/net/ipv6/addrconf.c
|
|
|
|
@@ -1107,7 +1107,7 @@ out:
|
|
|
|
@@ -1111,7 +1111,7 @@ out:
|
|
|
|
return ret;
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -41,7 +41,7 @@ |
|
|
|
const struct in6_addr *daddr, unsigned int prefs,
|
|
|
|
const struct in6_addr *daddr, unsigned int prefs,
|
|
|
|
struct in6_addr *saddr)
|
|
|
|
struct in6_addr *saddr)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
@@ -1232,7 +1232,6 @@ try_nextdev:
|
|
|
|
@@ -1236,7 +1236,6 @@ try_nextdev:
|
|
|
|
in6_ifa_put(hiscore->ifa);
|
|
|
|
in6_ifa_put(hiscore->ifa);
|
|
|
|
return 0;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -49,7 +49,7 @@ |
|
|
|
|
|
|
|
|
|
|
|
int ipv6_get_lladdr(struct net_device *dev, struct in6_addr *addr,
|
|
|
|
int ipv6_get_lladdr(struct net_device *dev, struct in6_addr *addr,
|
|
|
|
unsigned char banned_flags)
|
|
|
|
unsigned char banned_flags)
|
|
|
|
@@ -4814,6 +4813,9 @@ int __init addrconf_init(void)
|
|
|
|
@@ -4818,6 +4817,9 @@ int __init addrconf_init(void)
|
|
|
|
|
|
|
|
|
|
|
|
ipv6_addr_label_rtnl_register();
|
|
|
|
ipv6_addr_label_rtnl_register();
|
|
|
|
|
|
|
|
|
|
|
@ -59,7 +59,7 @@ |
|
|
|
return 0;
|
|
|
|
return 0;
|
|
|
|
errout:
|
|
|
|
errout:
|
|
|
|
rtnl_af_unregister(&inet6_ops);
|
|
|
|
rtnl_af_unregister(&inet6_ops);
|
|
|
|
@@ -4832,6 +4834,9 @@ void addrconf_cleanup(void)
|
|
|
|
@@ -4836,6 +4838,9 @@ void addrconf_cleanup(void)
|
|
|
|
struct net_device *dev;
|
|
|
|
struct net_device *dev;
|
|
|
|
int i;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
|
|