From nobody Fri Feb 21 01:57:13 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 4YzYCs5WyHz5nmKv; Fri, 21 Feb 2025 01:57:13 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YzYCs41lLz3nZr; Fri, 21 Feb 2025 01:57:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740103033; 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=cvte9nzIG7EXjmubPguK/5enDZ9/pvQu3QcKvW6Yz/Q=; b=lUbDmDuh8hDtPxr6Hcvfr22rJg5CnHeusU1/bwCDANqQ/zK2ubzlhc8OTsmUmY5YhDGoYc dSOo2KOhFw4AJ4NZle//4hG6jIO6fIzda5PR4XWIQJRh71G45ClDfAQ7ROyhaNpuej4evS m685V/CL5HrtJX0TzdkGRbmJbtDAj4DI1n2aiBSZvVVcVgnvdKFL4jvsdy1LAv+xIyXcQd 2EdVNcAFhRKfVquWhn9Y42BqVPVwpABPPhQL4iwSvKGb2LUa5W0T/9u71svWlSYdUsox/p XL9O5Mda945zVbfiquDT3P8/rU7SrE5VnW40VseuHmdjKoV/Dm02i0wdkQ6Vdw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740103033; a=rsa-sha256; cv=none; b=ZQy+C34VbPUmZn2gaqJcGCqDJiyNpr4S6NRW3YvtUDdr+zI6AJU0XlLqQgRDm6HVmX5Ohq 1IckByRHdfz/BQ8dbpcQ7P2dcPbPvEF4ZtIMJ5Rqv/FcsegLfYOiBGwOn1a87LjV/RZYCk BF8j/8X0bVSxvcBvSWr/rUPnT3QWKy1qkN7RVPflYNI3HIgZCv3ofJ4/e8QVgeLonTKvKA Mqvi6bWUZv9SuQgksSbPP3+SE2sZxULtcLlukJsQiBWGvpwtHs12iA2EiNaKl2nE/7roFb L4qqLaKKm4Ke7Wfgpy5ipuIpq0/Y7MsReFEJ16xf9AlTq5bC2Hc0frGXPKppMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740103033; 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=cvte9nzIG7EXjmubPguK/5enDZ9/pvQu3QcKvW6Yz/Q=; b=kMPO5aejak7VbAVJP8mMlEULttoDWXJROf6Z8sPdysmpe5RXIdGtcFuhpc9e+IJ1dtachX ebR5mjHkIh6Hyc+CrAo/SshijECwNlpcrV5bgZ1mZVNtbvvE4NIPAqI0Z7h7D+ZYwV79Re P84InDVtZ8XmR7PBcka2h4xIFeIoMT9eozN87YQhAjWhznpA9xWLwAFNBm0E/j2zfshAJE FsyPxbSqH+U4jwPHjvuAZ6Cbd6Jr/loDdxOAyd+wNse7gCB31tvqhCYx0NhTLjM8oGLWRe msyZvisMWW7cdo0WIHIFYvtuR4zYpQEGcmL/fyl2SaQ2R/bp1dsBNocRbHQbkw== 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 4YzYCs3NR7z1GXc; Fri, 21 Feb 2025 01:57:13 +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 51L1vDGm067322; Fri, 21 Feb 2025 01:57:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51L1vDKt067319; Fri, 21 Feb 2025 01:57:13 GMT (envelope-from git) Date: Fri, 21 Feb 2025 01:57:13 GMT Message-Id: <202502210157.51L1vDKt067319@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 0629203c5392 - stable/14 - inpcb: Remove some unused parameters in internal hash lookup functions 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0629203c53927bed33b1c87cde1a8e692d3a959e Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=0629203c53927bed33b1c87cde1a8e692d3a959e commit 0629203c53927bed33b1c87cde1a8e692d3a959e Author: Mark Johnston AuthorDate: 2024-11-08 14:25:19 +0000 Commit: Mark Johnston CommitDate: 2025-02-21 01:04:49 +0000 inpcb: Remove some unused parameters in internal hash lookup functions in_pcblookup_hash_wild_* looks up unconnected inpcbs, so there is no point in passing the foreign address and port, and indeed those parameters are not used. So, remove them. No functional change intended. MFC after: 1 week Sponsored by: Klara, Inc. Sponsored by: Stormshield Differential Revision: https://reviews.freebsd.org/D47385 (cherry picked from commit 21d7ac8c79a34cf3b7205d0c32014ee39f1f28ab) --- sys/netinet/in_pcb.c | 17 ++++++++--------- sys/netinet6/in6_pcb.c | 14 ++++++-------- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index 937fa6f826c0..32b7f1f96492 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -2256,9 +2256,8 @@ in_pcblookup_wild_match(const struct inpcb *inp, struct in_addr laddr, #define INP_LOOKUP_AGAIN ((struct inpcb *)(uintptr_t)-1) static struct inpcb * -in_pcblookup_hash_wild_smr(struct inpcbinfo *pcbinfo, struct in_addr faddr, - u_short fport, struct in_addr laddr, u_short lport, - const inp_lookup_t lockflags) +in_pcblookup_hash_wild_smr(struct inpcbinfo *pcbinfo, struct in_addr laddr, + u_short lport, const inp_lookup_t lockflags) { struct inpcbhead *head; struct inpcb *inp; @@ -2294,8 +2293,8 @@ in_pcblookup_hash_wild_smr(struct inpcbinfo *pcbinfo, struct in_addr faddr, } static struct inpcb * -in_pcblookup_hash_wild_locked(struct inpcbinfo *pcbinfo, struct in_addr faddr, - u_short fport, struct in_addr laddr, u_short lport) +in_pcblookup_hash_wild_locked(struct inpcbinfo *pcbinfo, struct in_addr laddr, + u_short lport) { struct inpcbhead *head; struct inpcb *inp, *local_wild, *local_exact, *jail_wild; @@ -2396,8 +2395,8 @@ in_pcblookup_hash_locked(struct inpcbinfo *pcbinfo, struct in_addr faddr, inp = in_pcblookup_lbgroup(pcbinfo, &faddr, fport, &laddr, lport, numa_domain); if (inp == NULL) { - inp = in_pcblookup_hash_wild_locked(pcbinfo, faddr, - fport, laddr, lport); + inp = in_pcblookup_hash_wild_locked(pcbinfo, laddr, + lport); } } @@ -2479,8 +2478,8 @@ in_pcblookup_hash_smr(struct inpcbinfo *pcbinfo, struct in_addr faddr, } inp = INP_LOOKUP_AGAIN; } else { - inp = in_pcblookup_hash_wild_smr(pcbinfo, faddr, fport, - laddr, lport, lockflags); + inp = in_pcblookup_hash_wild_smr(pcbinfo, laddr, lport, + lockflags); } if (inp == INP_LOOKUP_AGAIN) { return (in_pcblookup_hash(pcbinfo, faddr, fport, laddr, diff --git a/sys/netinet6/in6_pcb.c b/sys/netinet6/in6_pcb.c index a88e47abef64..c2cf856d0dfd 100644 --- a/sys/netinet6/in6_pcb.c +++ b/sys/netinet6/in6_pcb.c @@ -1066,8 +1066,7 @@ in6_pcblookup_wild_match(const struct inpcb *inp, const struct in6_addr *laddr, static struct inpcb * in6_pcblookup_hash_wild_smr(struct inpcbinfo *pcbinfo, - const struct in6_addr *faddr, u_short fport, const struct in6_addr *laddr, - u_short lport, const inp_lookup_t lockflags) + const struct in6_addr *laddr, u_short lport, const inp_lookup_t lockflags) { struct inpcbhead *head; struct inpcb *inp; @@ -1104,8 +1103,7 @@ in6_pcblookup_hash_wild_smr(struct inpcbinfo *pcbinfo, static struct inpcb * in6_pcblookup_hash_wild_locked(struct inpcbinfo *pcbinfo, - const struct in6_addr *faddr, u_short fport, const struct in6_addr *laddr, - u_short lport) + const struct in6_addr *laddr, u_short lport) { struct inpcbhead *head; struct inpcb *inp, *jail_wild, *local_exact, *local_wild; @@ -1187,8 +1185,8 @@ in6_pcblookup_hash_locked(struct inpcbinfo *pcbinfo, inp = in6_pcblookup_lbgroup(pcbinfo, faddr, fport, laddr, lport, numa_domain); if (inp == NULL) { - inp = in6_pcblookup_hash_wild_locked(pcbinfo, faddr, - fport, laddr, lport); + inp = in6_pcblookup_hash_wild_locked(pcbinfo, + laddr, lport); } } return (inp); @@ -1264,8 +1262,8 @@ in6_pcblookup_hash_smr(struct inpcbinfo *pcbinfo, const struct in6_addr *faddr, } inp = INP_LOOKUP_AGAIN; } else { - inp = in6_pcblookup_hash_wild_smr(pcbinfo, faddr, fport, - laddr, lport, lockflags); + inp = in6_pcblookup_hash_wild_smr(pcbinfo, laddr, lport, + lockflags); } if (inp == INP_LOOKUP_AGAIN) { return (in6_pcblookup_hash(pcbinfo, faddr, fport, laddr,