inet6: remove references to the crazies.

And add a comment that if we do this again to add a new knob for it.

diff --git a/src/if-bsd.c b/src/if-bsd.c
index 50045c8d3fc98be202da7e7ae85825952cac789a..824d4fd8fac9f509bcd9c98ad59916abcc1eaf76 100644 (file)
--- a/src/if-bsd.c
+++ b/src/if-bsd.c
@@ -1360,11 +1360,8 @@ set_ifxflags(int s, const struct interface *ifp)
        flags &= ~IFXF_NOINET6;
 #endif
        /*
-        * If dhcpcd is doing RS, disable RA support
-        * in the kernel. Otherwise, leave it alone.
-        * Logically it should be disabled regardless as dhcpcd can
-        * do it better and the user saying no RS means no RS even the kernel,
-        * but some crazy people want the kernel to do it still.
+        * If not doing autoconf, don't disable the kernel from doing it.
+        * If we need to, we should have another option actively disable it.
         */
        if (ifp->options->options & DHCPCD_IPV6RS)
                flags &= ~IFXF_AUTOCONF6;
@@ -1423,11 +1420,8 @@ if_setup_inet6(const struct interface *ifp)
 #endif
 
        /*
-        * If dhcpcd is doing RS, disable RA support
-        * in the kernel. Otherwise, leave it alone.
-        * Logically it should be disabled regardless as dhcpcd can
-        * do it better and the user saying no RS means no RS even the kernel,
-        * but some crazy people want the kernel to do it still.
+        * If not doing autoconf, don't disable the kernel from doing it.
+        * If we need to, we should have another option actively disable it.
         */
 #ifdef ND6_IFF_ACCEPT_RTADV
        if (ifp->options->options & DHCPCD_IPV6RS)

diff --git a/src/if-linux.c b/src/if-linux.c
index dfd3ffbe06d4b4edf7233dd9d5b75c2f69c0acb2..8c8dae31a157e4d4bad7bc0f093531090ada9dc9 100644 (file)
--- a/src/if-linux.c
+++ b/src/if-linux.c
@@ -1686,17 +1686,13 @@ if_setup_inet6(const struct interface *ifp)
        int ra;
        char path[256];
 
-       /* Unlike the kernel,
-        * dhcpcd make make a stable private address. */
+       /* The kernel cannot make stable private addresses. */
        if (if_disable_autolinklocal(ifp->ctx, ifp->index) == -1)
                logdebug("%s: if_disable_autolinklocal", ifp->name);
 
        /*
-        * If dhcpcd is doing RS, disable RA support
-        * in the kernel. Otherwise, leave it alone.
-        * Logically it should be disabled regardless as dhcpcd can
-        * do it better and the user saying no RS means no RS even the kernel,
-        * but some crazy people want the kernel to do it still.
+        * If not doing autoconf, don't disable the kernel from doing it.
+        * If we need to, we should have another option actively disable it.
         */
        if (!(ifp->options->options & DHCPCD_IPV6RS))
                return;