From nobody Thu Oct 19 14:20:44 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 4SB8yN4sbDz4xVQZ; Thu, 19 Oct 2023 14:20:44 +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 4SB8yN43DGz4Vtn; Thu, 19 Oct 2023 14:20:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697725244; 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=BWNEkWmM5sEcLdOqeOHS09L/jsV2ClRIUyMdw/QHo1g=; b=upoNxv4WwrtLFbIzAsUWUAQYSCQ4uKfx9RPDL4UJaNJuSeSONuctJMRY4MWqI2AhyWZV6v PLQLOoimeICEKNq6rX5mYNnp27FaGNbb4FZVVQ9hGdy2GA1mEDKdQHmrBhqhHI1SwTwJg3 BYTlqPzMny6+Dsj7BZRTA4m00m6Hm7cuQE5iHdQcFg1d5rZqvqWZqUdgoQIHv64BGALMpk UfpTYIfsjjpBFko59FIXChG4o3GFYcyd4PNCyJV9HrFDB44L1ly3RslpGeOlsFZpftkNiF NEXvuZR4somFkRBCrwXY0vFnz5L6x7nybHT5kF8lL6XsmyHBxAsk0gIUJasHng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697725244; a=rsa-sha256; cv=none; b=XYhos5UuKztyZuR5MsnAqOl+GcHEBq5qoYEg9aWNL9HPzo+G/HflghjJi89ge8zN5tIF8j Rcpi3OmwKS8D/0NqZF7JIltZFDAMyFig5lZmNfymRUdM0R73bI0MXs7Nit9mmaMXQh0QXx 5hLtsE6RcVwGAGH7OczlsVNMXBYqOIjqlGkem8CURorpO7SZt4kExxrH0j6GG0A9CNx02D eldhVFk3IS5xSpc3ZrE+7JlFFTTI77mkBG2vhrvJfYfek6cXPtVavZP50C+MvM/uho1ogS GAsrGEsF8wv4q3bUo0CzrdDCBejAHwg75EddXI1V5/cQOrpCw1cR1TiOsaF1/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697725244; 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=BWNEkWmM5sEcLdOqeOHS09L/jsV2ClRIUyMdw/QHo1g=; b=Py7eRciAluYBTTf5bHbO0tboEpJI5hNYkiGN9LPL1rVoc7a1LfLsy0KDQWjA4UaSbH3Xdi E8mzR3PesRvysav+/J07fh4Z1XWHa27b1GGeFY2DXDHeSoIiPpM/THTBSuEOom6o5SSSxT aMrLcYqdZ3Fk6Vuz2N+rFbQQih08h8+xh8VHZIJyDtIGBgr/P61RczWN9s7QN5dkh2UJC1 wO9oqd2iffBoqPBnG+6Cy0AQ2IKKBJKFOZiMvEmPKXj2by/U+XgiXRqL8wTzC8NqY2EUCW EAnJ3tTcz4K3OIBt6T6Q7uTjkUGbWoPVcGJ/ml+KM0rU4vvGppOaJvQv414whg== 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 4SB8yN3704zsbF; Thu, 19 Oct 2023 14:20:44 +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 39JEKiCK071111; Thu, 19 Oct 2023 14:20:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JEKitw071108; Thu, 19 Oct 2023 14:20:44 GMT (envelope-from git) Date: Thu, 19 Oct 2023 14:20:44 GMT Message-Id: <202310191420.39JEKitw071108@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: 9eff6390718d - main - 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: 9eff6390718d0fa67dffc6cd830b0bc6b815e8c4 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=9eff6390718d0fa67dffc6cd830b0bc6b815e8c4 commit 9eff6390718d0fa67dffc6cd830b0bc6b815e8c4 Author: Kristof Provost AuthorDate: 2023-10-19 10:06:29 +0000 Commit: Kristof Provost CommitDate: 2023-10-19 14:19:39 +0000 pf: remove COMPAT_FREEBSD14 #ifdef from pfvar.h When userspace includes pfvar.h it doesn't get the kernel's COMPAT_* defines, so we end up not having required symbols in userspace. This caused the libpfctl port to fail to build. libpfctl will be updated to use the new netlink-based state export code soon, which will also fix thix build issue. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/net/pfvar.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index 59579a0849d9..ec8f8293945b 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -1951,9 +1951,7 @@ 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) @@ -2014,9 +2012,7 @@ 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)