The branch main has been updated by kp:
URL:
https://cgit.FreeBSD.org/src/commit/?id=7f81f87a74a413f7c1a42ba9a48dd21603fa94e1
commit 7f81f87a74a413f7c1a42ba9a48dd21603fa94e1
Author: Kristof Provost <k...@freebsd.org>
AuthorDate: 2025-05-29 11:24:46 +0000
Commit: Kristof Provost <k...@freebsd.org>
CommitDate: 2025-05-29 11:54:55 +0000
pf: remove unused 'dir' argument in pf_reassemble()
pf_reassemble() only uses it to pass to pf_ip2key(), which also does not
use it.
Sponsored by: Rubicon Communications, LLC ("Netgate")
---
sys/netpfil/pf/pf_norm.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/sys/netpfil/pf/pf_norm.c b/sys/netpfil/pf/pf_norm.c
index 8157ea556591..ed9aed157993 100644
--- a/sys/netpfil/pf/pf_norm.c
+++ b/sys/netpfil/pf/pf_norm.c
@@ -147,7 +147,7 @@ static struct pf_fragment *pf_fillup_fragment(struct
pf_fragment_cmp *,
struct pf_frent *, u_short *);
static struct mbuf *pf_join_fragment(struct pf_fragment *);
#ifdef INET
-static int pf_reassemble(struct mbuf **, int, u_short *);
+static int pf_reassemble(struct mbuf **, u_short *);
#endif /* INET */
#ifdef INET6
static int pf_reassemble6(struct mbuf **,
@@ -163,7 +163,7 @@ static int pf_reassemble6(struct mbuf **,
#ifdef INET
static void
-pf_ip2key(struct ip *ip, int dir, struct pf_fragment_cmp *key)
+pf_ip2key(struct ip *ip, struct pf_fragment_cmp *key)
{
key->frc_src.v4 = ip->ip_src;
@@ -735,7 +735,7 @@ pf_join_fragment(struct pf_fragment *frag)
#ifdef INET
static int
-pf_reassemble(struct mbuf **m0, int dir, u_short *reason)
+pf_reassemble(struct mbuf **m0, u_short *reason)
{
struct mbuf *m = *m0;
struct ip *ip = mtod(m, struct ip *);
@@ -759,7 +759,7 @@ pf_reassemble(struct mbuf **m0, int dir, u_short *reason)
frent->fe_off = (ntohs(ip->ip_off) & IP_OFFMASK) << 3;
frent->fe_mff = ntohs(ip->ip_off) & IP_MF;
- pf_ip2key(ip, dir, &key);
+ pf_ip2key(ip, &key);
if ((frag = pf_fillup_fragment(&key, frent, reason)) == NULL)
return (PF_DROP);
@@ -1200,7 +1200,7 @@ pf_normalize_ip(u_short *reason, struct pf_pdesc *pd)
* Might return a completely reassembled mbuf, or NULL */
PF_FRAG_LOCK();
DPFPRINTF(("reass frag %d @ %d-%d\n", h->ip_id, fragoff, max));
- verdict = pf_reassemble(&pd->m, pd->dir, reason);
+ verdict = pf_reassemble(&pd->m, reason);
PF_FRAG_UNLOCK();
if (verdict != PF_PASS)
