From nobody Tue Sep 2 21:10:54 2025 X-Original-To: dev-commits-src-main@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 4cGdgy43BLz65S4k; Tue, 02 Sep 2025 21:10:54 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cGdgy1qQ0z41yQ; Tue, 02 Sep 2025 21:10:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756847454; 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=lAjIDq18nXCXEdTXu2qN4zn+OH+c6O2QLSAnH+r8SG8=; b=g0nf3a4YUmZ/P06sebRZXswgeqJViPYwwahsftHkctmHw62z+zgA8aoPqznbIGaEgpHFj2 VXjQ5xz843/vEmDlUkYiWtgOCrnSlpfpkTJhpVCQArQZiP4Fcg9DTz+CO9hYDQLgo233Md tx7Y3NqGRZx7PjMVXTJokk8S/zRr7ZDTHE14My2SmI8DyVf923gUx+Vi5QakOuZmauvo2x N02wgHmjlo/5ndR4eYmXloFpW75aFRNdwa0oZeUN2iFkAT4x8NcM5M9ooEUViJ68ltpAKZ gZirWDGuART+QbQF91Fqi/rAHpHihbsIiXw5p+Arzzpr6HDqKu0SELO/oXccgw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756847454; 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=lAjIDq18nXCXEdTXu2qN4zn+OH+c6O2QLSAnH+r8SG8=; b=M1J3H6cTOF7Q8crE0AMrZjd/oI//FpYWDPhX/ZN6GnKV16xJdNDdUBE0Mo0EpVURcyCSs2 GroMzr2gEk96DqAr2uKkZjXs8jgTpe96JJsCu0EDie5/DHKR9TrRlOtkyIUK2YstBJm3Xi C6fMR71KayLEIsZwf5uhJj5SEwJTM7TiHOKvy+xUjDBIrte0aKFQ6cZPqouDsvm2WKmdhQ hsyeA0HXQCGwirDOG88ZMYSIwZvTkCss/9bKZeyif0xRyNqvz7CCt4TkNm5ep9aS6zKRk6 bTmnrJ5kuKDCiQbZCof2NdjNygylJyk/tFcCIe5l09Y+tv2VitR2J/UoH/ElAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756847454; a=rsa-sha256; cv=none; b=Fkj4HQJdHnN2Z0PVOzLf0WbmIs+gvj0Z+dey9wYDW3aJ6Nnr6ehqfmz0ucg8uy9xSEmy7y 8Qu23c94sOpIQ6Kj+520Qt3oyymsnweWKqHTJqYubxtdjOuitLt2gGVZM0Qncz3Nlv80x1 L4wAwWzW/THgEPC5Lts1ndVVVBhtIHzJMaZYxZ9PxMljHnKYKwuRL1vNwfQzy+ZcSt7xk8 QtuppeoV2h/DjD++0nWYRo8BW9nDYbvXWGs896LVqngwgHnA5JnJzQcpYk4bCLaVAQU9cv 1p8jQWmc29Ju6lwoXqg5YdHItt8M4c0k/vX+AK8gO3SE2oH3+skPnmIJ+MOArw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cGdgy1Ln7z13KD; Tue, 02 Sep 2025 21:10:54 +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 582LAsaS036479; Tue, 2 Sep 2025 21:10:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 582LAsIt036476; Tue, 2 Sep 2025 21:10:54 GMT (envelope-from git) Date: Tue, 2 Sep 2025 21:10:54 GMT Message-Id: <202509022110.582LAsIt036476@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: 5af7499b6d81 - main - pf: remove unused variables List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 5af7499b6d81e0514dc79d74a10e2b2a0e3fe08b Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=5af7499b6d81e0514dc79d74a10e2b2a0e3fe08b commit 5af7499b6d81e0514dc79d74a10e2b2a0e3fe08b Author: Kristof Provost AuthorDate: 2025-08-19 09:13:06 +0000 Commit: Kristof Provost CommitDate: 2025-09-02 21:10:20 +0000 pf: remove unused variables We never actually use action or reason in pf_state_key_addr_setup(), so just pass NULL to pf_pull_hdr(). No functional change. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index a9d89afd58a1..e9b73827aa7d 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -1667,7 +1667,6 @@ pf_state_key_addr_setup(struct pf_pdesc *pd, #ifdef INET6 struct nd_neighbor_solicit nd; struct pf_addr *target; - u_short action, reason; if (pd->af == AF_INET || pd->proto != IPPROTO_ICMPV6) goto copy; @@ -1676,7 +1675,8 @@ pf_state_key_addr_setup(struct pf_pdesc *pd, case ND_NEIGHBOR_SOLICIT: if (multi) return (-1); - if (!pf_pull_hdr(pd->m, pd->off, &nd, sizeof(nd), &action, &reason, pd->af)) + if (!pf_pull_hdr(pd->m, pd->off, &nd, sizeof(nd), NULL, + NULL, pd->af)) return (-1); target = (struct pf_addr *)&nd.nd_ns_target; daddr = target; @@ -1684,7 +1684,8 @@ pf_state_key_addr_setup(struct pf_pdesc *pd, case ND_NEIGHBOR_ADVERT: if (multi) return (-1); - if (!pf_pull_hdr(pd->m, pd->off, &nd, sizeof(nd), &action, &reason, pd->af)) + if (!pf_pull_hdr(pd->m, pd->off, &nd, sizeof(nd), NULL, + NULL, pd->af)) return (-1); target = (struct pf_addr *)&nd.nd_ns_target; saddr = target;