From nobody Mon Aug 24 19:06:51 2026 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 4hTL4c4NwJz6pmDn for ; Mon, 24 Aug 2026 19:06:56 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hTL4c3nC9z3ZrY for ; Mon, 24 Aug 2026 19:06:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787598416; 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=x0KPb7EsI2/1+DcJ7xzfLd0+o4jvJYkOmxx0FuNNHbU=; b=ZpA0nx/7n/rsydTlwKKPHRmdzSI/pKkFk+gSAzytVjboisVOyEHZz06SST+C0XanEgx+a+ RvgMiBv4p29n5ifVmvcwQk/kIGweTdgIyOj3Xfa0W0LAhR7UZF/gxiFUV5uHOUj7oC4iNv WUvupejuxXEhHTiklI25PCar+XOrvANGoaKyWLTobfs9flQdrLGg4huvjJM6DaRfpJLF0a WRV8Z9kj0dC7sCLDTO9z8MomTRmpqzytRUHCiD40pCSnN1bewIRyur3TWhqomHWctwhYEC 9+9ZbTYs5PWCzxLvVVuyDQh/Tg6c3pM3SvZAaFnkxo8NFDuD6GVdnbd8E9Xn8w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787598416; a=rsa-sha256; cv=none; b=NvfTMV8UyB4N13LqOF2LjmO/JUSw+qVHnr7EYV0PcEGzDCTK148M08PlXK3i7UHiDTPWzi mjvERJP0azgUfzs9jhFPyOqMszKC/pp94BMHBA+3/trbhIAQqYsVfYEPPcCZd4g1XTpS66 AOOxPueUCvEyRgSA7X2bDkXIOPRiE8lU3iPfbCvDf9WX2PtHLSaZzDb7beGMKtVn0/fRlg R9bpl88VtPKoeIr8oY581F6RLlHitue083M3C8mPfYWpkDPKjfYPjo+Q5gp+Qzw2G4x25z IXTf1zyO6gT7MeYT3kswioSJf/HdbTz1YFgRR1aQ4X1RJDvXpUqruUnZKuJKvw== 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=1787598416; 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=x0KPb7EsI2/1+DcJ7xzfLd0+o4jvJYkOmxx0FuNNHbU=; b=c9eU8Tvvi3YZEAuU4GIaZNAUfUt4AyVvxbqIaAN3fDpD3cqzasZ24ksLC8AobSlidkFFau qDlgTECnCNp5iCKa2cuOmLjNCdwhixUI+qZD8ejM4n8Y3LXUj81JfphfhGCWlxHDAViRPA E15s2338deeDpAvihosHKrZrRFRvmph/BnFvg/HE3zlxEsoq94zsuH95+JYckXboq6V+l8 KSSf5pGWhYt3D6MVZIsVmfDzL1QYNvTuzjThRB0NQtF+/ZWMzGI+LupYH6ISrN4UYQ82pv ZIeJWy8a1vU/NhwKsqDoSTmXPb+LrQx7lUL79DYm50NTqtCauBZwDBHH3U/xZQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hTL4c2YKWz2Q1 for ; Mon, 24 Aug 2026 19:06:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39dbb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 24 Aug 2026 19:06:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 191dad334c64 - main - tcp: minor cleanup 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 191dad334c646457c012d0d0963505a2f2d73a98 Auto-Submitted: auto-generated Date: Mon, 24 Aug 2026 19:06:51 +0000 Message-Id: <6a8c964b.39dbb.7453d22b@gitrepo.freebsd.org> The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=191dad334c646457c012d0d0963505a2f2d73a98 commit 191dad334c646457c012d0d0963505a2f2d73a98 Author: Michael Tuexen AuthorDate: 2026-08-24 19:00:14 +0000 Commit: Michael Tuexen CommitDate: 2026-08-24 19:05:56 +0000 tcp: minor cleanup Several cleanups in tcp_input_with_port(): * Don't assign m twice. * Don't reassign pointers without having done pullup(). * While there, change the type of isipv6 to bool, since it is used that way. No functional change intended. Reported by: Hannes Elfert Reviewed by: pouria, Timo Völker, Nick Banks MFC after: 1 week MFC to: stable/15 Differential Revision: https://reviews.freebsd.org/D59142 --- sys/netinet/tcp_input.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 1e60774b3fb0..17d20e5e6401 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -596,7 +596,7 @@ tcp6_input(struct mbuf **mp, int *offp, int proto) int tcp_input_with_port(struct mbuf **mp, int *offp, int proto, uint16_t port) { - struct mbuf *m = *mp; + struct mbuf *m; struct tcphdr *th = NULL; struct ip *ip = NULL; struct inpcb *inp = NULL; @@ -617,7 +617,7 @@ tcp_input_with_port(struct mbuf **mp, int *offp, int proto, uint16_t port) struct m_tag *fwd_tag = NULL; #ifdef INET6 struct ip6_hdr *ip6 = NULL; - int isipv6; + bool isipv6; #else const void *ip6 = NULL; #endif /* INET6 */ @@ -627,10 +627,6 @@ tcp_input_with_port(struct mbuf **mp, int *offp, int proto, uint16_t port) NET_EPOCH_ASSERT(); -#ifdef INET6 - isipv6 = (mtod(m, struct ip *)->ip_v == 6) ? 1 : 0; -#endif - off0 = *offp; m = *mp; *mp = NULL; @@ -639,6 +635,7 @@ tcp_input_with_port(struct mbuf **mp, int *offp, int proto, uint16_t port) m->m_pkthdr.tcp_tun_port = port; #ifdef INET6 + isipv6 = mtod(m, struct ip *)->ip_v == 6; if (isipv6) { ip6 = mtod(m, struct ip6_hdr *); th = (struct tcphdr *)((caddr_t)ip6 + off0); @@ -777,9 +774,9 @@ tcp_input_with_port(struct mbuf **mp, int *offp, int proto, uint16_t port) TCPSTAT_INC(tcps_rcvshort); return (IPPROTO_DONE); } + ip6 = mtod(m, struct ip6_hdr *); + th = (struct tcphdr *)((caddr_t)ip6 + off0); } - ip6 = mtod(m, struct ip6_hdr *); - th = (struct tcphdr *)((caddr_t)ip6 + off0); } #endif #if defined(INET) && defined(INET6)