From owner-dev-commits-src-all@freebsd.org Sat Jan 2 00:06:32 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D03F84B856D; Sat, 2 Jan 2021 00:06:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D72HX5KnQz4XqG; Sat, 2 Jan 2021 00:06:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A526733E1; Sat, 2 Jan 2021 00:06:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 10206WhR019626; Sat, 2 Jan 2021 00:06:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 10206Wfe019625; Sat, 2 Jan 2021 00:06:32 GMT (envelope-from git) Date: Sat, 2 Jan 2021 00:06:32 GMT Message-Id: <202101020006.10206Wfe019625@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Xin LI Subject: git: bfe90bb336cc - main - usr.sbin/rtadvctl: Remove support for FreeBSD 9.x. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bfe90bb336ccccded5ce51d72ed01ebfbb447337 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Jan 2021 00:06:32 -0000 The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=bfe90bb336ccccded5ce51d72ed01ebfbb447337 commit bfe90bb336ccccded5ce51d72ed01ebfbb447337 Author: Xin LI AuthorDate: 2021-01-02 00:04:55 +0000 Commit: Xin LI CommitDate: 2021-01-02 00:06:08 +0000 usr.sbin/rtadvctl: Remove support for FreeBSD 9.x. --- usr.sbin/rtadvctl/rtadvctl.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/usr.sbin/rtadvctl/rtadvctl.c b/usr.sbin/rtadvctl/rtadvctl.c index 556f9ac7ebbf..8bbd7afb6dd5 100644 --- a/usr.sbin/rtadvctl/rtadvctl.c +++ b/usr.sbin/rtadvctl/rtadvctl.c @@ -514,19 +514,6 @@ action_show(int argc, char **argv) if ((ifi_s->ifi_flags & IFF_UP) && ((ifi_s->ifi_state == IFI_STATE_CONFIGURED) || (ifi_s->ifi_state == IFI_STATE_TRANSITIVE))) { -#if (__FreeBSD_version < 900000) - /* - * RA_RECV: !ip6.forwarding && ip6.accept_rtadv - * RA_SEND: ip6.forwarding - */ - if (getinet6sysctl(IPV6CTL_FORWARDING) == 0) { - if (getinet6sysctl(IPV6CTL_ACCEPT_RTADV)) - ra_ifstatus = RA_IFSTATUS_RA_RECV; - else - ra_ifstatus = RA_IFSTATUS_INACTIVE; - } else - ra_ifstatus = RA_IFSTATUS_RA_SEND; -#else /* * RA_RECV: ND6_IFF_ACCEPT_RTADV * RA_SEND: ip6.forwarding @@ -537,7 +524,6 @@ action_show(int argc, char **argv) ra_ifstatus = RA_IFSTATUS_RA_SEND; else ra_ifstatus = RA_IFSTATUS_INACTIVE; -#endif } c = 0;