From nobody Tue Jul 15 20:51:15 2025 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 4bhWYv5zZ1z61bMS; Tue, 15 Jul 2025 20:51:15 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bhWYv5PJnz3MSN; Tue, 15 Jul 2025 20:51:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752612675; 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=On4sbwwg9nAwf844nAC+8tHdL14pk8HeQmDM8INYBro=; b=kCWcKAh5iDgpcZTfHIGYRC7iPeNpxXHg0v7VUoQxwFPrztVVe1tE/vCZJ+IkqLIqPSdgop 4M5hMjvQpO6lLcJ3RO0q8NkJDtsZ8zRyYgQGzSWJcC1cmpjbCzRHzBWdIMPrPxDzYQTQfb 7BNjHxP8fDfhCSXVMjAS+EL0+DD6fJJFjBT76oYWQFZABrC4stejNoyDzeM/xqdiJLdD1z 7hpkhNHVGgSgn2oR3e+UMZ4tRXUDGF+5FXsSEjc5Po4gAn0L8BUWxkI61tq4uoTiRgGG5Y XkDfio98Zgb4Y32xb/x8OSKAioxehW+kVATes1Iq6c1eYnw83JJ6IjWXmjKnfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752612675; 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=On4sbwwg9nAwf844nAC+8tHdL14pk8HeQmDM8INYBro=; b=UFs4hSAk2mM3a3en7kJCEgagj41AnAs17j+G6r3G7X4XMV5CwsViFdNaJ2W5F3GUqwZ2X+ 4pfVDdSH7wm5jEhNfqQNzdFmqMkanikKus8zqCYcfu0xNWgPDpHdaR1rDSz03m5a7qlxLP BSNWq3LsfwzT3R0KtHOpg0eB7TBK/vq70UQl8yirz02nOG15dPMG74ztqVrjuti6Fv+ney 8zcfeA/1joS6i9KQd+f0VA18wbgDPfRT0KXNvBONcCpg/3oqaRT/iuNprIcz+LcsviGjsu ogGHOiSKtU0BqhSBW+ZcqDNnLFS0mIQ2UeclqJ8W3XC9lfIZF6LhuAoea1DDdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752612675; a=rsa-sha256; cv=none; b=cFT4i+LKoI0tvldOo+O8KJckSUlm5H4uvKuZzdAAqvkt4aGLuo/bsP8IJa+SXPv/Rlkpi/ o1KrMDZ3a9ghln5wN68LG3qfs0ekv3W8Y7iAkj2aP84t/IkuOSGS2I94bhbYO0H3jQY5WG ZkpfCVxefb7s3lkxgzS3fxySB6dINdtkAocZf5590l11hCTbSMlSbPqmAUeSL1EpZ8pgin PGSseB8DQ86hlhMXymJFsyZHPgV4c/Q3Tv5iF90wmCWjsMph/a/lyY+3FvKSyJf24/qOfB QdpDt6uh6+FbckFFkfNgYBRuFTr3NDoRhmu03dUA3K1uV+F9cY1yaj63WJGlbA== 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 4bhWYv50VgzwKs; Tue, 15 Jul 2025 20:51:15 +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 56FKpFQX046392; Tue, 15 Jul 2025 20:51:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56FKpFE4046389; Tue, 15 Jul 2025 20:51:15 GMT (envelope-from git) Date: Tue, 15 Jul 2025 20:51:15 GMT Message-Id: <202507152051.56FKpFE4046389@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: ea97c397d75c - main - pf: remove unused argument from pf_send_icmp() 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: ea97c397d75c3fd108b1bc033f39d3e6d41c7dfe Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=ea97c397d75c3fd108b1bc033f39d3e6d41c7dfe commit ea97c397d75c3fd108b1bc033f39d3e6d41c7dfe Author: Kristof Provost AuthorDate: 2025-07-15 06:32:49 +0000 Commit: Kristof Provost 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;