From nobody Mon Oct 30 10:12:30 2023 X-Original-To: dev-commits-src-all@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 4SJpwt6Y6Kz4xjQl; Mon, 30 Oct 2023 10:12:30 +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 4SJpwt66pdz4QtB; Mon, 30 Oct 2023 10:12:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698660750; 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=/nA07o7uphfBldVFhT+4511tCMffnn7gTGLZr+Zsnhg=; b=ZU6wPChraBYrWlDA4jLb7H8KGZusB/Z4rRIlX0uQHc/YLfWAxLJSeyxHY91wwjIdrMFXZS RnOFv2LD8gmtIVksTj7XuVcflGjWm4SDRnD7N/8G2qrWPIPXhf6zGgo+A8I3x7NcxfS/Aq YodxdbdBi6wLeBhWIfqcy3Mk1s8NLzcoXSpynJw7q4CrK0FVbeyXNGTHeXRM04U3TWJyLz VdqaN7PpGYofFDCNRaM3qWd1FTQDmjsUdB/OpC//o5mMGu+25Rwyta/gL5VuZk4ytO6A3k 4mEyUuWyTcafyRZyTQ4WCtH/YhVzWLIzCyWjDs+RNH02DhGyPLQCtYo0ixNzwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698660750; 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=/nA07o7uphfBldVFhT+4511tCMffnn7gTGLZr+Zsnhg=; b=vggOufLLrzgZnK7H/hRe3J5rKyGsJfRTx9yh243wotU2V00g9eduAcOyBlPYDJa8CCcwFZ fkBJLog/rMYDTepNuVoqJXZzjePj5SZAIppEho0QSrQuc/iOR9X0zyhfkruy2TPOHNdYie s4dLXwhN0ndsT4+diCasRDIgYKbZJmocGC/jxsHNsMKSI2Rh9R676IMk++JAAXmHoJ3i9f e3h6owKCjlLQ21Pc/wvioZd0DZX+Zl/Hv1A0ShIer8/kip3OZAlYYRE9ITyRxV47MQbcPF Q+WXILGQfNZ4OV/A/kUbZDnZEW8wos47eHUfWqJIUSi6HJ9reO53jLB2Y6WpMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698660750; a=rsa-sha256; cv=none; b=XN/xen4WdmiECfbQDDKp1IMZm9l61iXBWiUoAujRH4ZaK1nadJ3uoVR/D1mJMotfdjcdbh X1XsK0kDbk2XrAOqCF4bb5exTg9Ieh3rjltBm63Fub4vv3hP0DH54T3r1PerEgTvPdghkN O4ELKZDTPJV/mrOsVtXqbXloT4r3j6yO2etZXwuiTXc8PLUdpgG4EFOBVKlOrYCn9DU4YR g4fvq4xfGiJoApTMW4W2a66O8P4C8Rj1QaECibUu2LxsMCktGLUbzWJiowlilgLg5IS8Uc +HVPp7GzgcQfJLYwH7cN7LCtHKLFp+t0qMYsLdA5hIKxq2ep9OKaj5C9Ib4lhw== 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 4SJpwt59mPz2hf; Mon, 30 Oct 2023 10:12:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39UACUXi062375; Mon, 30 Oct 2023 10:12:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39UACUkb062372; Mon, 30 Oct 2023 10:12:30 GMT (envelope-from git) Date: Mon, 30 Oct 2023 10:12:30 GMT Message-Id: <202310301012.39UACUkb062372@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 586fae3cd286 - main - Revert "pf: remove COMPAT_FREEBSD14 #ifdef from pfvar.h" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 586fae3cd28661cfb45bb12306c8e6d048bb9f2e Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=586fae3cd28661cfb45bb12306c8e6d048bb9f2e commit 586fae3cd28661cfb45bb12306c8e6d048bb9f2e Author: Kristof Provost AuthorDate: 2023-10-30 08:09:56 +0000 Commit: Kristof Provost CommitDate: 2023-10-30 08:17:56 +0000 Revert "pf: remove COMPAT_FREEBSD14 #ifdef from pfvar.h" This reverts commit 9eff6390718d0fa67dffc6cd830b0bc6b815e8c4. The libpfctl port has been fixed (to avoid using DIOCGETSTATESV2), so we can now safely revert this. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/net/pfvar.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index 6a5f8761755d..27992864c899 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -1952,7 +1952,9 @@ struct pfioc_iface { #define DIOCCLRSTATUS _IO ('D', 22) #define DIOCNATLOOK _IOWR('D', 23, struct pfioc_natlook) #define DIOCSETDEBUG _IOWR('D', 24, u_int32_t) +#ifdef COMPAT_FREEBSD14 #define DIOCGETSTATES _IOWR('D', 25, struct pfioc_states) +#endif #define DIOCCHANGERULE _IOWR('D', 26, struct pfioc_rule) /* XXX cut 26 - 28 */ #define DIOCSETTIMEOUT _IOWR('D', 29, struct pfioc_tm) @@ -2013,7 +2015,9 @@ struct pfioc_iface { #define DIOCKILLSRCNODES _IOWR('D', 91, struct pfioc_src_node_kill) #define DIOCGIFSPEEDV0 _IOWR('D', 92, struct pf_ifspeed_v0) #define DIOCGIFSPEEDV1 _IOWR('D', 92, struct pf_ifspeed_v1) +#ifdef COMPAT_FREEBSD14 #define DIOCGETSTATESV2 _IOWR('D', 93, struct pfioc_states_v2) +#endif #define DIOCGETSYNCOOKIES _IOWR('D', 94, struct pfioc_nv) #define DIOCSETSYNCOOKIES _IOWR('D', 95, struct pfioc_nv) #define DIOCKEEPCOUNTERS _IOWR('D', 96, struct pfioc_nv)