OK?

diff --git sys/netinet6/nd6.c sys/netinet6/nd6.c
index 77bcd1c5fda..7fd647c115a 100644
--- sys/netinet6/nd6.c
+++ sys/netinet6/nd6.c
@@ -139,7 +139,7 @@ nd6_ifattach(struct ifnet *ifp)
        nd->reachable = ND_COMPUTE_RTIME(nd->basereachable);
        nd->retrans = RETRANS_TIMER;
        /* per-interface IFXF_AUTOCONF6 needs to be set too to accept RAs */
-       nd->flags = (ND6_IFF_PERFORMNUD | ND6_IFF_ACCEPT_RTADV);
+       nd->flags = ND6_IFF_PERFORMNUD;
 
        return nd;
 }
diff --git sys/netinet6/nd6.h sys/netinet6/nd6.h
index 04885bc9c3e..a3b9746e73d 100644
--- sys/netinet6/nd6.h
+++ sys/netinet6/nd6.h
@@ -53,7 +53,6 @@ struct nd_ifinfo {
 };
 
 #define ND6_IFF_PERFORMNUD     0x1
-#define ND6_IFF_ACCEPT_RTADV   0x2
 
 struct in6_nbrinfo {
        char ifname[IFNAMSIZ];  /* if name, e.g. "en0" */
diff --git usr.sbin/ndp/ndp.8 usr.sbin/ndp/ndp.8
index 23f7aceb697..a2e863fbb97 100644
--- usr.sbin/ndp/ndp.8
+++ usr.sbin/ndp/ndp.8
@@ -140,12 +140,6 @@ in this case.
 Turn on or off NUD (Neighbor Unreachability Detection) on the
 interface.
 NUD is usually turned on by default.
-.It Ic accept_rtadv
-Specify whether or not to accept Router Advertisement messages
-received on the
-.Ar interface .
-Note that the kernel does not accept Router Advertisement messages
-unless the interface is configured for inet6 autoconfiguration.
 .El
 .It Fl n
 Do not try to resolve numeric addresses to hostnames.
diff --git usr.sbin/ndp/ndp.c usr.sbin/ndp/ndp.c
index 75ff6f6168d..800385d7779 100644
--- usr.sbin/ndp/ndp.c
+++ usr.sbin/ndp/ndp.c
@@ -917,7 +917,6 @@ ifinfo(char *ifname, int argc, char **argv)
                }\
        } while (0)
                SETFLAG("nud", ND6_IFF_PERFORMNUD);
-               SETFLAG("accept_rtadv", ND6_IFF_ACCEPT_RTADV);
 
                nd.ndi.flags = newflags;
                if (ioctl(s, SIOCSIFINFO_FLAGS, (caddr_t)&nd) < 0) {
@@ -940,9 +939,7 @@ ifinfo(char *ifname, int argc, char **argv)
        if (nd.ndi.flags) {
                printf("\nFlags: ");
                if ((nd.ndi.flags & ND6_IFF_PERFORMNUD))
-                       printf("nud ");
-               if ((nd.ndi.flags & ND6_IFF_ACCEPT_RTADV))
-                       printf("accept_rtadv ");
+                       printf("nud");
        }
        putc('\n', stdout);
 
-- 
I'm not entirely sure you are real.

Reply via email to