svn commit: r350086 - head/usr.sbin/rtadvd

[Mark Johnston]

Author: markj
Date: Wed Jul 17 16:50:53 2019
New Revision: 350086
URL: https://svnweb.freebsd.org/changeset/base/350086

Log:
  Remove obsolete compatibility code from rtadvd.
  
  MFC after:	1 week

Modified:
  head/usr.sbin/rtadvd/rtadvd.c

Modified: head/usr.sbin/rtadvd/rtadvd.c
==============================================================================
--- head/usr.sbin/rtadvd/rtadvd.c	Wed Jul 17 16:38:40 2019	(r350085)
+++ head/usr.sbin/rtadvd/rtadvd.c	Wed Jul 17 16:50:53 2019	(r350086)
@@ -1052,15 +1052,8 @@ check_accept_rtadv(int idx)
 		    __func__, idx);
 		return (0);
 	}
-#if (__FreeBSD_version < 900000)
+
 	/*
-	 * RA_RECV: !ip6.forwarding && ip6.accept_rtadv
-	 * RA_SEND: ip6.forwarding
-	 */
-	return ((getinet6sysctl(IPV6CTL_FORWARDING) == 0) &&
-	    (getinet6sysctl(IPV6CTL_ACCEPT_RTADV) == 1));
-#else
-	/*
 	 * RA_RECV: ND6_IFF_ACCEPT_RTADV
 	 * RA_SEND: ip6.forwarding
 	 */
@@ -1070,7 +1063,6 @@ check_accept_rtadv(int idx)
 	}
 
 	return (ifi->ifi_nd_flags & ND6_IFF_ACCEPT_RTADV);
-#endif
 }
 
 static void