From nobody Sat Feb 04 16:20:08 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4P8Hmm4KY5z3nZ5M; Sat, 4 Feb 2023 16:20:08 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P8Hmm3pzJz43BZ; Sat, 4 Feb 2023 16:20:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675527608; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IarRdswWzvORTlPY0PXRKCg6uwxwrtZDW26wk8Io0CQ=; b=HwQJqZ7lM8KMXmcSUjkggQx4l2JTsxtkjHd3HEOfZ090S5jqInUsK+aatWIbj+3AjTKo9z IHuOztWaV0U6jG0hHrDXbqyUvlxhs9MAULUqvZ9Tq6SeoQA60Qa/iSUS7V6AxD2R8yx82L pxIYY6x/dhxCk9pxDe9lMM+v3BPE0NjxfSgfgCy82r0aewCAOx8R7FlSJJsfej5+pUXUUn ygl4Wyj1EdBdlArBvPIzWBrftFa1QudmlAomoCmIo1RTZ2ud38Cy77lShuXcVsybc+qbfj AHajaZ1LOb0tulsOqUbPG5T2Xy1faAsN+HoRWJwaakqErb8H/fJqGeUnrgv7qA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675527608; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IarRdswWzvORTlPY0PXRKCg6uwxwrtZDW26wk8Io0CQ=; b=ebxdzOteki3dmHNg7iYc3ERUBY6kEq0bsaM3pgQ7N0jMy5PiuGPHSkMRNUGqE0Zvs2aVah UIMmRogl1cfD/a7lnSUDQLoxgsmozlQpujIhaOuiH15Jrg2mJQ7IN22OZ7FaVA4bg9m7Ax aT45ulETiPt97M+7xtxyJ9cQjhSkIHDeYUtehp2S01F+cctLPsAjUIkDRlRMBfVzi2pmml 0Fn9XETsFa+oqPr6PdwitIB17MzU8h3tNTzzzElHWCC7xWu2QpYNDRFzyG+/befz0NQzMX 7ajE3IIjkdqMiaWaCTdBXdEBYHAK7sz4asblwJRYzTTNxnZ58WhBgucfSb1Wxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675527608; a=rsa-sha256; cv=none; b=OHtsqc0gcACIR8+IGztwPmI+o+XxPKzmEapcgXBkbIjQRw+3sBKrA30qEOxI0QoqWWXv0l hhyxoitziCV5BxJW9hIlY84kOjAVq+Xrh9HN9zDOYKaUFYKAI3AZZUMzXA02hFNbrm1DgA STujo13/Ab0rwihcW/HKAktjVBs5uwi4fgqpgL/9+hDr/hpggabbnaLwLO/REaqB3fL9B7 63hSJ+/tBpS9PmI41llpPeXa+8NAKfd8tRQqKHfgL8kbKv6rojZosfklM8NHNp5Na6I6NK 6f3tFUjlmK6Uq5plUvo0pVlUZ/Y/B0mCDnKJClLqvC1fgjGc91PFaagKnUGjUA== 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 4P8Hmm2sN7zLBR; Sat, 4 Feb 2023 16:20:08 +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 314GK8wp008149; Sat, 4 Feb 2023 16:20:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 314GK8Y2008145; Sat, 4 Feb 2023 16:20:08 GMT (envelope-from git) Date: Sat, 4 Feb 2023 16:20:08 GMT Message-Id: <202302041620.314GK8Y2008145@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: ef2235ec65fd - main - altq: purge EOL release compatibility List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ef2235ec65fdb31a1caf0215c269413b0e7630e5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ef2235ec65fdb31a1caf0215c269413b0e7630e5 commit ef2235ec65fdb31a1caf0215c269413b0e7630e5 Author: Elliott Mitchell AuthorDate: 2022-06-23 00:53:47 +0000 Commit: Warner Losh CommitDate: 2023-02-04 16:10:27 +0000 altq: purge EOL release compatibility Remove conditionals checking for End-of-Life releases, dating back to 3.0 in this case... Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/603 Differential Revision: https://reviews.freebsd.org/D35560 --- sys/net/altq/altq_rmclass.c | 8 +------- sys/net/altq/altq_subr.c | 8 +------- sys/net/altq/altq_var.h | 10 ---------- 3 files changed, 2 insertions(+), 24 deletions(-) diff --git a/sys/net/altq/altq_rmclass.c b/sys/net/altq/altq_rmclass.c index 6e64a0a6f80e..886641065d14 100644 --- a/sys/net/altq/altq_rmclass.c +++ b/sys/net/altq/altq_rmclass.c @@ -1449,13 +1449,8 @@ void rmc_dropall(struct rm_class *cl) } } -#if (__FreeBSD_version > 300000) -/* hzto() is removed from FreeBSD-3.0 */ -static int hzto(struct timeval *); - static int -hzto(tv) - struct timeval *tv; +hzto(struct timeval *tv) { struct timeval t2; @@ -1464,7 +1459,6 @@ hzto(tv) t2.tv_usec = tv->tv_usec - t2.tv_usec; return (tvtohz(&t2)); } -#endif /* __FreeBSD_version > 300000 */ /* * void diff --git a/sys/net/altq/altq_subr.c b/sys/net/altq/altq_subr.c index 04ea1bc91e28..d569aa3f3ab3 100644 --- a/sys/net/altq/altq_subr.c +++ b/sys/net/altq/altq_subr.c @@ -81,11 +81,7 @@ static void tbr_timeout(void *); static struct mbuf *tbr_dequeue(struct ifaltq *, int); static int tbr_timer = 0; /* token bucket regulator timer */ -#if !defined(__FreeBSD__) || (__FreeBSD_version < 600000) -static struct callout tbr_callout = CALLOUT_INITIALIZER; -#else static struct callout tbr_callout; -#endif #ifdef ALTQ3_CLFIER_COMPAT static int extract_ports4(struct mbuf *, struct ip *, struct flowinfo_in *); @@ -883,7 +879,6 @@ u_int32_t machclk_per_tick; extern u_int64_t cpu_tsc_freq; #endif -#if (__FreeBSD_version >= 700035) /* Update TSC freq with the value indicated by the caller. */ static void tsc_freq_changed(void *arg, const struct cf_level *level, int status) @@ -892,7 +887,7 @@ tsc_freq_changed(void *arg, const struct cf_level *level, int status) if (status != 0) return; -#if (__FreeBSD_version >= 701102) && (defined(__amd64__) || defined(__i386__)) +#if defined(__amd64__) || defined(__i386__) /* If TSC is P-state invariant, don't do anything. */ if (tsc_is_invariant) return; @@ -903,7 +898,6 @@ tsc_freq_changed(void *arg, const struct cf_level *level, int status) } EVENTHANDLER_DEFINE(cpufreq_post_change, tsc_freq_changed, NULL, EVENTHANDLER_PRI_LAST); -#endif /* __FreeBSD_version >= 700035 */ static void init_machclk_setup(void) diff --git a/sys/net/altq/altq_var.h b/sys/net/altq/altq_var.h index 6763fd972d7d..3be03482b8c9 100644 --- a/sys/net/altq/altq_var.h +++ b/sys/net/altq/altq_var.h @@ -64,25 +64,15 @@ struct acc_filter { #endif #define ACC_GET_HINDEX(handle) ((handle) >> 20) -#if (__FreeBSD_version > 500000) #define ACC_LOCK_INIT(ac) mtx_init(&(ac)->acc_mtx, "classifier", MTX_DEF) #define ACC_LOCK_DESTROY(ac) mtx_destroy(&(ac)->acc_mtx) #define ACC_LOCK(ac) mtx_lock(&(ac)->acc_mtx) #define ACC_UNLOCK(ac) mtx_unlock(&(ac)->acc_mtx) -#else -#define ACC_LOCK_INIT(ac) -#define ACC_LOCK_DESTROY(ac) -#define ACC_LOCK(ac) -#define ACC_UNLOCK(ac) -#endif struct acc_classifier { u_int32_t acc_fbmask; LIST_HEAD(filt, acc_filter) acc_filters[ACC_FILTER_TABLESIZE]; - -#if (__FreeBSD_version > 500000) struct mtx acc_mtx; -#endif }; /*