git: 86fc6f838ed2 - main - pf: make pf_setup_pdesc() a static function

From: Kristof Provost <kp_at_FreeBSD.org>
Date: Fri, 27 Sep 2024 22:17:16 UTC
The branch main has been updated by kp:

URL: https://cgit.FreeBSD.org/src/commit/?id=86fc6f838ed2a01f8bffa2cd6437052f450f3370

commit 86fc6f838ed2a01f8bffa2cd6437052f450f3370
Author:     Kristof Provost <kp@FreeBSD.org>
AuthorDate: 2024-09-16 13:24:15 +0000
Commit:     Kristof Provost <kp@FreeBSD.org>
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,