svn commit: r350289 - stable/12/usr.sbin/rtadvd

[Mark Johnston]

Author: markj
Date: Wed Jul 24 14:39:31 2019
New Revision: 350289
URL: https://svnweb.freebsd.org/changeset/base/350289

Log:
  MFC r350086:
  Remove obsolete compatibility code from rtadvd.

Modified:
  stable/12/usr.sbin/rtadvd/rtadvd.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/usr.sbin/rtadvd/rtadvd.c
==============================================================================
--- stable/12/usr.sbin/rtadvd/rtadvd.c	Wed Jul 24 14:15:31 2019	(r350288)
+++ stable/12/usr.sbin/rtadvd/rtadvd.c	Wed Jul 24 14:39:31 2019	(r350289)
@@ -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