aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6
diff options
context:
space:
mode:
Diffstat (limited to 'net/ipv6')
-rw-r--r--net/ipv6/Kconfig2
-rw-r--r--net/ipv6/addrconf.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/Kconfig b/net/ipv6/Kconfig
index ca8cb326d1d2..ead6c7a42f44 100644
--- a/net/ipv6/Kconfig
+++ b/net/ipv6/Kconfig
@@ -168,7 +168,7 @@ config IPV6_SIT
168 into IPv4 packets. This is useful if you want to connect two IPv6 168 into IPv4 packets. This is useful if you want to connect two IPv6
169 networks over an IPv4-only path. 169 networks over an IPv4-only path.
170 170
171 Saying M here will produce a module called sit.ko. If unsure, say Y. 171 Saying M here will produce a module called sit. If unsure, say Y.
172 172
173config IPV6_NDISC_NODETYPE 173config IPV6_NDISC_NODETYPE
174 bool 174 bool
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index c3488372f12d..8c1e86afbbf5 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -2766,7 +2766,7 @@ static void addrconf_dad_start(struct inet6_ifaddr *ifp, u32 flags)
2766 spin_unlock_bh(&ifp->lock); 2766 spin_unlock_bh(&ifp->lock);
2767 read_unlock_bh(&idev->lock); 2767 read_unlock_bh(&idev->lock);
2768 /* 2768 /*
2769 * If the defice is not ready: 2769 * If the device is not ready:
2770 * - keep it tentative if it is a permanent address. 2770 * - keep it tentative if it is a permanent address.
2771 * - otherwise, kill it. 2771 * - otherwise, kill it.
2772 */ 2772 */