From nobody Fri Sep 27 22:17:16 2024 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 4XFlFT1ftCz5XK3b; Fri, 27 Sep 2024 22:17:17 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XFlFS66dkz4kr3; Fri, 27 Sep 2024 22:17:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727475436; 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=9n7JgUGvHyPOalHGG2LkHDBEHjnXsOrUqsXzJGQ7WN8=; b=imAedC2U/Pr7ya/vtzkqytko2+tfySBOs0PucjCWvXZZTeu4NClr4SnzrtNP4nT7+Ta3pY lkOYurg8X30S0cEIVOFCqira+sL9MhTjMBqKulGGQC4b2qfBAPZ1Qq7uRq5cG/4gwlY0JZ zIPqHiq8oeZC+idlxRkLW0JRo9yv4SgrcQaIDrt8pHLBvsYd46dasbHgmQv1hWMDOTUhwC z+y4lTO586d/iKV97C6xjHqpN/N6JCoH0k+V1N0Vb8MKjr26R6Jw5qM32shZqwYGMEc5h6 nwBepwjQFWjYt3s5z92rbBV8Tj+crelFQj1tbKbwpjiEARgRoJZyDE5YYGxcQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727475436; 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=9n7JgUGvHyPOalHGG2LkHDBEHjnXsOrUqsXzJGQ7WN8=; b=EGiU87UVPT/Hu8QCfs7BhGZZ11Sb+4mgZbAAaWqOBztY+KGOR0jkIOGkYgh1bW9v5q5dPM a10QuL40EC8HsEy4GOXOd00DRnIS5DgZNm8R2ABWtE4gdwLghvJgk6h9Y+ZbYDbze25jKb LwC2Mb9zBONW0YdsQ8QhZ0KfB6jdRo0070XmKeF21DHAkxvdQ0eiRCPGCPwHsqW3HyIfiL Wx2nsJ34EfZ1JJcS/QQvlYb2vOEsUaG2hr3MG70rEnchSSRX5qlphwntr8xUJUI39xJIyG R0ST7YsoQkeOvxLP2JfvSKJarqcOlYDEoB9tV9j+rXEcL6+a/hpEIKeamYSCgg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727475436; a=rsa-sha256; cv=none; b=h56qZiIakYGnhTdSjhu2GcNFSyEgSfR84Kt4pL5SLBlsydb7j3G2mrHYaA5KKtg3GMCp+w Lx9EK5B5QdUFXhdpjnF11DG7X9CoDzp+ZbsBgpWnHBDzCa2hWHLZqYqRHU0fhxovJgVoWQ zWkuqMgo+MBiFjP/aJUSbeuAd3sAqCVum7vjz+cnjgID8+pAfzVQsk24S+SRoU7uMJLZ8h qgtwR2gCdagb95Ebzko/QT35iGPIyDaXslrwoGgnrXqDapjakyb+zQUoj5QCughinJ+j/W na/VAdVI6/dZWojdsXCGtMYgZrgF7xWRxTlGQThF2D83hFO2j46Jm9Qsr4C78w== 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 4XFlFS4cZvzy8J; Fri, 27 Sep 2024 22:17:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48RMHGix039368; Fri, 27 Sep 2024 22:17:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48RMHGmm039365; Fri, 27 Sep 2024 22:17:16 GMT (envelope-from git) Date: Fri, 27 Sep 2024 22:17:16 GMT Message-Id: <202409272217.48RMHGmm039365@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: 86fc6f838ed2 - main - pf: make pf_setup_pdesc() a static function 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 86fc6f838ed2a01f8bffa2cd6437052f450f3370 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=86fc6f838ed2a01f8bffa2cd6437052f450f3370 commit 86fc6f838ed2a01f8bffa2cd6437052f450f3370 Author: Kristof Provost AuthorDate: 2024-09-16 13:24:15 +0000 Commit: Kristof Provost CommitDate: 2024-09-27 20:13:23 +0000 pf: make pf_setup_pdesc() a static function We only ever call it from pf_test(), and implement it in the same source file. Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D46706 --- sys/net/pfvar.h | 6 ------ sys/netpfil/pf/pf.c | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index f5551447f7aa..3afbabf30d4d 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -2352,12 +2352,6 @@ VNET_DECLARE(struct pf_krule, pf_default_rule); extern void pf_addrcpy(struct pf_addr *, struct pf_addr *, sa_family_t); void pf_free_rule(struct pf_krule *); -int pf_setup_pdesc(sa_family_t, int, - struct pf_pdesc *, struct mbuf *, - u_short *, u_short *, struct pfi_kkif *, - struct pf_krule **, struct pf_krule **, - struct pf_kruleset **, int *, int *, - struct pf_rule_actions *); int pf_test_eth(int, int, struct ifnet *, struct mbuf **, struct inpcb *); int pf_scan_sctp(struct mbuf *, int, struct pf_pdesc *, struct pfi_kkif *); diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 823e90384747..1634c856f51f 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -8555,7 +8555,7 @@ pf_dummynet_route(struct pf_pdesc *pd, struct pf_kstate *s, return (0); } -int +static int pf_setup_pdesc(sa_family_t af, int dir, struct pf_pdesc *pd, struct mbuf *m, u_short *action, u_short *reason, struct pfi_kkif *kif, struct pf_krule **a, struct pf_krule **r, struct pf_kruleset **ruleset, int *off, int *hdrlen,