From nobody Fri Jun 27 21:17:10 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 4bTT065c05z60H26; Fri, 27 Jun 2025 21:17:10 +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 4bTT065040z3HGP; Fri, 27 Jun 2025 21:17:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751059030; 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=I8dB9KZlizCq3S7IFSpcklDC8tgSGopNpNbhB+vT71U=; b=A5ZvyEjrN5QKXC1XIa0gzSdIALad2hhPXQTv0qhdV7qjEjccaKjJELTPNN5rmXHRc2hm2P cEjtzvMMP2n+awHxJ1UOXL5dHaEcOL4ymY1tte+IHUTSvzaNlZRCQIAwvF6DB+Do8tDxCE F1n9ZDV00Xvbtkjlh1gQglVxaxbZmDqSk+Sk3wvVL5wgKXWZE8OHjvq5RSN2EsgrfrFfTO QvNRo7dBlWlzHHKLuHm1djhydlkgpvTNipnY1EGRkhzjFdYcGSZRhD4Y83BotSg4uEQaMD VqpEP65NJhbQUVnbYjHfweUN7qFuFHO54EIUnKkgP7gAQkVHyvje6rBJ+Gvj6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751059030; 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=I8dB9KZlizCq3S7IFSpcklDC8tgSGopNpNbhB+vT71U=; b=ndtZnfZO0yq8J1UgY4RGwze5ukOOVq/Vi91SE8IFQLtWAtwrpenFNB/Tnpx8ght92R0V1V W/oLmZbWtck5Xc1utX6PEAbXET9OpmLUNKiMDDyW14OBffi9cboNFRoXTDUxJwOxXsrHRv 5+VgbkSFwi6SR/9G3lTsd1jButYqMNQPenGQI8xUSHyXvhj8CaPWDsx40izNbJcc3QhCdS 8MBARS2vnsVDBObCHdCmcyVTSVtLWwyXML8p/VJtdo2fFyJjLfuiJoTaOixcA2oedvR+hg EwdZKdXTCzcrLBCy/Dg38r6nyKdVQPm+T+B2lPaeFRudZqXrhfbyNXRj0uRsQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751059030; a=rsa-sha256; cv=none; b=s7dCi/C/t8C2/TwuF/cZnqqMPaxnoZh7AlTzqfIDCODCfg1+6n4oh/sEJ8zg9JVyLD2CpQ hEw/LvGTpEJI3LWjq1Ij06wsQw51LZ8+B9hG4z82pHUIWlx5Y/kXCDRy8dWv0aqeYWxAxc Au69b+dSqeyfp6hzcmZMQKQsGFWta3u/Gt06Ir2+XElFW8CSFl3zRuIwHTzYifeBvkRrnV wYDaD+QRbDjNYOGS0giaADlz/WljLTRsjJiazBAhI7/jDy0AIqZReItcmqmxuTP8k1ze/p dzVkTA8v/74UqAlpNTFsLjN+32nQCZUDuFagLwMkaqbAzotRP1igJDTiJBZJjA== 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 4bTT0647rFz14Xw; Fri, 27 Jun 2025 21:17:10 +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 55RLHANS026763; Fri, 27 Jun 2025 21:17:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55RLHAFp026759; Fri, 27 Jun 2025 21:17:10 GMT (envelope-from git) Date: Fri, 27 Jun 2025 21:17:10 GMT Message-Id: <202506272117.55RLHAFp026759@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: ea6376adc8b9 - main - tcp: improve name of function 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ea6376adc8b969936259537ed894213162b376e8 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=ea6376adc8b969936259537ed894213162b376e8 commit ea6376adc8b969936259537ed894213162b376e8 Author: Michael Tuexen AuthorDate: 2025-06-27 21:04:12 +0000 Commit: Michael Tuexen CommitDate: 2025-06-27 21:04:12 +0000 tcp: improve name of function Let us call the function to compute the effetive MSL tcp_eff_msl() instead of just tcp_msl(). This avoids a conflict with !VIMAGE builds, since in that case there is a global variable with name tcp_msl. Reported by: kp Fixes: 5fb4b091e835 ("tcp: allow specifying a MSL for local communications") --- sys/netinet/tcp_timewait.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/netinet/tcp_timewait.c b/sys/netinet/tcp_timewait.c index 7c6c55909215..c095fc8f7765 100644 --- a/sys/netinet/tcp_timewait.c +++ b/sys/netinet/tcp_timewait.c @@ -112,7 +112,7 @@ SYSCTL_PROC(_net_inet_tcp, OID_AUTO, nolocaltimewait, "Do not create TCP TIME_WAIT state for local connections"); static u_int -tcp_msl(struct tcpcb *tp) +tcp_eff_msl(struct tcpcb *tp) { struct inpcb *inp = tptoinpcb(tp); #ifdef INET6 @@ -180,7 +180,7 @@ tcp_twstart(struct tcpcb *tp) return; } - tcp_timer_activate(tp, TT_2MSL, 2 * tcp_msl(tp)); + tcp_timer_activate(tp, TT_2MSL, 2 * tcp_eff_msl(tp)); INP_WUNLOCK(inp); } @@ -323,7 +323,7 @@ tcp_twcheck(struct inpcb *inp, struct tcpopt *to, struct tcphdr *th, if (thflags & TH_FIN) { seq = th->th_seq + tlen + (thflags & TH_SYN ? 1 : 0); if (seq + 1 == tp->rcv_nxt) - tcp_timer_activate(tp, TT_2MSL, 2 * tcp_msl(tp)); + tcp_timer_activate(tp, TT_2MSL, 2 * tcp_eff_msl(tp)); } /*