The branch main has been updated by kp:
URL:
https://cgit.FreeBSD.org/src/commit/?id=ea97c397d75c3fd108b1bc033f39d3e6d41c7dfe
commit ea97c397d75c3fd108b1bc033f39d3e6d41c7dfe
Author: Kristof Provost <k...@freebsd.org>
AuthorDate: 2025-07-15 06:32:49 +0000
Commit: Kristof Provost <k...@freebsd.org>
CommitDate: 2025-07-15 18:49:13 +0000
pf: remove unused argument from pf_send_icmp()
We never use the struct pf_krule, so remove that argument.
Sponsored by: Rubicon Communications, LLC ("Netgate")
---
sys/netpfil/pf/pf.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c
index 63d513fb1956..264830fcf534 100644
--- a/sys/netpfil/pf/pf.c
+++ b/sys/netpfil/pf/pf.c
@@ -327,7 +327,7 @@ int pf_change_icmp_af(struct mbuf *, int,
sa_family_t);
int pf_translate_icmp_af(int, void *);
static void pf_send_icmp(struct mbuf *, u_int8_t, u_int8_t,
- int, sa_family_t, struct pf_krule *, int);
+ int, sa_family_t, int);
static void pf_detach_state(struct pf_kstate *);
static int pf_state_key_attach(struct pf_state_key *,
struct pf_state_key *, struct pf_kstate *);
@@ -4349,11 +4349,11 @@ pf_return(struct pf_krule *r, struct pf_krule *nr,
struct pf_pdesc *pd,
} else if (pd->proto != IPPROTO_ICMP && pd->af == AF_INET &&
r->return_icmp)
pf_send_icmp(pd->m, r->return_icmp >> 8,
- r->return_icmp & 255, 0, pd->af, r, rtableid);
+ r->return_icmp & 255, 0, pd->af, rtableid);
else if (pd->proto != IPPROTO_ICMPV6 && pd->af == AF_INET6 &&
r->return_icmp6)
pf_send_icmp(pd->m, r->return_icmp6 >> 8,
- r->return_icmp6 & 255, 0, pd->af, r, rtableid);
+ r->return_icmp6 & 255, 0, pd->af, rtableid);
}
static int
@@ -4411,7 +4411,7 @@ pf_send_challenge_ack(struct pf_pdesc *pd, struct
pf_kstate *s,
static void
pf_send_icmp(struct mbuf *m, u_int8_t type, u_int8_t code, int mtu,
- sa_family_t af, struct pf_krule *r, int rtableid)
+ sa_family_t af, int rtableid)
{
struct pf_send_entry *pfse;
struct mbuf *m0;
@@ -9016,7 +9016,7 @@ pf_route(struct pf_krule *r, struct ifnet *oifp,
if (ip->ip_ttl <= IPTTLDEC) {
if (r->rt != PF_DUPTO)
pf_send_icmp(m0, ICMP_TIMXCEED,
- ICMP_TIMXCEED_INTRANS, 0, pd->af, r,
+ ICMP_TIMXCEED_INTRANS, 0, pd->af,
pd->act.rtableid);
goto bad_locked;
}
@@ -9162,7 +9162,7 @@ pf_route(struct pf_krule *r, struct ifnet *oifp,
}
pf_send_icmp(m0, ICMP_UNREACH, ICMP_UNREACH_NEEDFRAG,
- ifp->if_mtu, pd->af, r, pd->act.rtableid);
+ ifp->if_mtu, pd->af, pd->act.rtableid);
}
SDT_PROBE1(pf, ip, route_to, drop, __LINE__);
goto bad;
@@ -9313,7 +9313,7 @@ pf_route6(struct pf_krule *r, struct ifnet *oifp,
if (ip6->ip6_hlim <= IPV6_HLIMDEC) {
if (r->rt != PF_DUPTO)
pf_send_icmp(m0, ICMP6_TIME_EXCEEDED,
- ICMP6_TIME_EXCEED_TRANSIT, 0, pd->af, r,
+ ICMP6_TIME_EXCEED_TRANSIT, 0, pd->af,
pd->act.rtableid);
goto bad_locked;
}
@@ -9462,7 +9462,7 @@ pf_route6(struct pf_krule *r, struct ifnet *oifp,
if (r->rt != PF_DUPTO)
pf_send_icmp(m0, ICMP6_PACKET_TOO_BIG, 0,
- ifp->if_mtu, pd->af, r, pd->act.rtableid);
+ ifp->if_mtu, pd->af, pd->act.rtableid);
}
SDT_PROBE1(pf, ip6, route_to, drop, __LINE__);
goto bad;
