From nobody Sat Feb 04 16:20:23 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 4P8Hn40Ngpz3nZ9V; Sat, 4 Feb 2023 16:20:24 +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 4P8Hn36zVBz449g; Sat, 4 Feb 2023 16:20:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675527624; 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=qY+qaCezu3HLjSUTG2v8l5OANOFQFlJOZRViwcYNDS4=; b=Hrvb4gBUbHthVasggcbyA4PgqbKbHLqo6G66vvy1IwYuiiJxNz5+fz4mg0n2JCseUGoTje 7o8x3SteLloRlykslPr52KyFPxbEfxcM0xywMvAljl0qh7v/pbLp07BkTlWanXd1mBls5s 6f6TapZn0HLt24ocBCSEnYCjsAuuxf4rq737TuhT6o6te7cfCC7hppG7SqG9MDoENkM8aC Xarwof0BOsHMhWKxTUuXVD67R4UrL62LlGYrQ1U4cD/ZtOSiB6EWHVgkAxWr1v/ZaS/B5Q Ww7bVVpFAukmeBqro7Gt5sJU/HjJmksP2NH7LKe5KjDlYLkRgAxW/DvqTlYRTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675527624; 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=qY+qaCezu3HLjSUTG2v8l5OANOFQFlJOZRViwcYNDS4=; b=Hi0S7JVVvZXnPc8tzIo8yUAm+rORYh0UK6DLgh5y2bAybUx6h+mdkNL8K9RYcX5GaYORtZ Iwsxsp/mj1qUF3GDNdt0o6cFlrRfQx8hRUkdWbsl4zT7Q7wvJUUBHExpV5xQemX/ghFD7q zg0tgKbv0jaTModuwTDfRHTJcqt86nJFnFQGIsyrGeBGq1BFEF27DALrlbHyzrchr0j/SG TkCkkeN2I9bdA+j4TCzRey17ojqlqZ8yE6f0X3ev7EGB815D5VRFtH74KNK9di2eHDq5UD 5z4bzYEfg34c9QLnCiySpanUWnnoX2heWDwX+Fq5npMPvZjExbWrDl/AddEoiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675527624; a=rsa-sha256; cv=none; b=Cr2QEhHLHt44/uWTIQw2JGm973eQc/wcY4EdDIAb9/zTj/DPB1Kkon623iSaqucpIZ7MV5 L36VTjrlqlXp6IMa2QE2YuSGxLh4MAEYycLwYKPTSjvPOhNOC0jQucuiDbiMyOWsEfH67r pBgMcGMoVJRIXXAnSD+2iKxIF6wTd3P8ZhoU0tYvG56ZvqPFooG0y+rjjXbjSNeXcB4AnU EHLQuxe8x1P816lREem0DcW6cM6bQP5DhTdskycTSFPLx9yRy6Zk626GkY/Zkazd144Eod ISWl0IJce2ZOtw4F8JlMMOEor5rP3IcRGckST4cNF7TkG6qUl98KMB9kDkCZFQ== 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 4P8Hn35QPqzLfN; Sat, 4 Feb 2023 16:20:23 +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 314GKNAX013541; Sat, 4 Feb 2023 16:20:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 314GKN2h013540; Sat, 4 Feb 2023 16:20:23 GMT (envelope-from git) Date: Sat, 4 Feb 2023 16:20:23 GMT Message-Id: <202302041620.314GKN2h013540@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: 097e192a9c20 - main - iavf: 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: 097e192a9c203d98c0b097d1517f87342896f676 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=097e192a9c203d98c0b097d1517f87342896f676 commit 097e192a9c203d98c0b097d1517f87342896f676 Author: Elliott Mitchell AuthorDate: 2022-06-23 00:53:47 +0000 Commit: Warner Losh CommitDate: 2023-02-04 16:13:08 +0000 iavf: purge EOL release compatibility Drop code that differentiated between FreeBSD 10 and 11 Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/603 Differential Revision: https://reviews.freebsd.org/D35560 --- sys/dev/iavf/iavf_lib.c | 4 ---- sys/dev/iavf/iavf_lib.h | 15 --------------- 2 files changed, 19 deletions(-) diff --git a/sys/dev/iavf/iavf_lib.c b/sys/dev/iavf/iavf_lib.c index 61de2a438c12..a7363c7e873a 100644 --- a/sys/dev/iavf/iavf_lib.c +++ b/sys/dev/iavf/iavf_lib.c @@ -986,11 +986,7 @@ iavf_media_change_common(if_t ifp) void iavf_set_initial_baudrate(if_t ifp) { -#if __FreeBSD_version >= 1100000 if_setbaudrate(ifp, IF_Gbps(40)); -#else - if_initbaudrate(ifp, IF_Gbps(40)); -#endif } /** diff --git a/sys/dev/iavf/iavf_lib.h b/sys/dev/iavf/iavf_lib.h index d0e1d6e53c2d..3238219775d8 100644 --- a/sys/dev/iavf/iavf_lib.h +++ b/sys/dev/iavf/iavf_lib.h @@ -206,7 +206,6 @@ MALLOC_DECLARE(M_IAVF); IAVF_DEFAULT_ADV_RSS_HENA) /* Pre-11 counter(9) compatibility */ -#if __FreeBSD_version >= 1100036 #define IAVF_SET_IPACKETS(vsi, count) (vsi)->ipackets = (count) #define IAVF_SET_IERRORS(vsi, count) (vsi)->ierrors = (count) #define IAVF_SET_OPACKETS(vsi, count) (vsi)->opackets = (count) @@ -219,20 +218,6 @@ MALLOC_DECLARE(M_IAVF); #define IAVF_SET_IQDROPS(vsi, count) (vsi)->iqdrops = (count) #define IAVF_SET_OQDROPS(vsi, count) (vsi)->oqdrops = (count) #define IAVF_SET_NOPROTO(vsi, count) (vsi)->noproto = (count) -#else -#define IAVF_SET_IPACKETS(vsi, count) (vsi)->ifp->if_ipackets = (count) -#define IAVF_SET_IERRORS(vsi, count) (vsi)->ifp->if_ierrors = (count) -#define IAVF_SET_OPACKETS(vsi, count) (vsi)->ifp->if_opackets = (count) -#define IAVF_SET_OERRORS(vsi, count) (vsi)->ifp->if_oerrors = (count) -#define IAVF_SET_COLLISIONS(vsi, count) (vsi)->ifp->if_collisions = (count) -#define IAVF_SET_IBYTES(vsi, count) (vsi)->ifp->if_ibytes = (count) -#define IAVF_SET_OBYTES(vsi, count) (vsi)->ifp->if_obytes = (count) -#define IAVF_SET_IMCASTS(vsi, count) (vsi)->ifp->if_imcasts = (count) -#define IAVF_SET_OMCASTS(vsi, count) (vsi)->ifp->if_omcasts = (count) -#define IAVF_SET_IQDROPS(vsi, count) (vsi)->ifp->if_iqdrops = (count) -#define IAVF_SET_OQDROPS(vsi, odrops) (vsi)->ifp->if_snd.ifq_drops = (odrops) -#define IAVF_SET_NOPROTO(vsi, count) (vsi)->noproto = (count) -#endif /* For stats sysctl naming */ #define IAVF_QUEUE_NAME_LEN 32