From nobody Fri Aug 18 13:05:41 2023 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 4RS2DQ0ft2z4qVf6; Fri, 18 Aug 2023 13:05:42 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RS2DQ0BHlz4TL7; Fri, 18 Aug 2023 13:05:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692363942; 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=aClGHp0e/gl0V4SqMK7hRSoNFaQt3zd9WLMpD3ycUt4=; b=rqTTgQNi8h2wfRb1Grhh4odlXoFEvpn+zEB5wmeH/TaFQirjagiOG251pYwALtiDBTKIEa yz1de4S40tW2QBtjadICph+txqBXEbz2LnH6ece91aTPfm6eJD4eUATp7B/avCjedviiIf z4jOPo5ajfCqS3wMo2lmhWUZZCwb/paK+tqQ5L7PyPyN916o8uTg0VNS+0+xXTP+tO67k6 jLdPQP90d1ItP8v8mI3fpKDPQThlPfgnTfz4v0f9zBhSJj+KpAC2gU/3fSRZ16pQ6npFvz QxTE8daLHyzhsEi9D1hWcMNxX5kf/vUX7EKDe9GrhWSi9avkWnHm1SuK5xvV9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692363942; 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=aClGHp0e/gl0V4SqMK7hRSoNFaQt3zd9WLMpD3ycUt4=; b=yoz/8VkO8lOs6y1m1zB/AOAE8owXp4oUd6teegIWrepM8i2/aj7orn4eNwt95VXJeh+AjN UX0H/7S2904O0//baERs3dcbMe64tT+sYwUljPso4fcDOBgBzQe8mNSkqqwPGPYTooSYOD 5GTIgSxEgJvFAjWOPJF7M32zcKxlCdgEwTuKy5vG1+6+ELPsWvze1yQCEx0PImXXYcpuYV QoEtc7iWhuDhhDFdrUUHMwVR38msntbSVVvO9X8wHnaW331AOjacSjKckLzNJwcnGbR3he 0X758S0IrcShPkAtZs5dB8lygy+zxQTaTvc359AST/PSYlFMVfRKYCm5HD8Tdw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692363942; a=rsa-sha256; cv=none; b=G+b1Dsjw9kRtMCX9iCAmunLSKjOhos5uz6LHALuEZiqgD6vVqDq9CQuRoXySqQrtaRXK+Z YS0f2JrfW+02/DiGhLNjejd5YsGeSu72h+PVyst+4OwGJsZInopKKhwjbQcRakuAACOigN loBj9oaXutj7PXwd6mgJzr/R+/D8V5vEEugeC9eOD0IVSkZw9XuvlaOo2J5uI7lRJ9+q1f Q5RMvYMFfUoBH1xhtIjxdkQnYslMArhfyXUoAC2+7fhFpkuR2hZVIXiz4lWQwJlU49XZ70 UbzwejEUb3LJVvo2n/P/qCeMsWPeOkbMXiir6m+IddzfmxXKKPiFuFZvitA1uA== 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 4RS2DP6F9cz2Yx; Fri, 18 Aug 2023 13:05:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37ID5fbU001825; Fri, 18 Aug 2023 13:05:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37ID5f5F001822; Fri, 18 Aug 2023 13:05:41 GMT (envelope-from git) Date: Fri, 18 Aug 2023 13:05:41 GMT Message-Id: <202308181305.37ID5f5F001822@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: fb259f62bbf7 - main - sctp: unbreak congestion control dtrace support 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: fb259f62bbf75e9aa64eab13e20e075ec25465ed Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=fb259f62bbf75e9aa64eab13e20e075ec25465ed commit fb259f62bbf75e9aa64eab13e20e075ec25465ed Author: Michael Tuexen AuthorDate: 2023-08-18 13:01:35 +0000 Commit: Michael Tuexen CommitDate: 2023-08-18 13:01:35 +0000 sctp: unbreak congestion control dtrace support Fix a typo and improve consistency of handling variables only used when compiling with dtrace support. MFC after: 1 week --- sys/netinet/sctp_cc_functions.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/sys/netinet/sctp_cc_functions.c b/sys/netinet/sctp_cc_functions.c index 1e515a9d69e3..adcce72060f2 100644 --- a/sys/netinet/sctp_cc_functions.c +++ b/sys/netinet/sctp_cc_functions.c @@ -52,7 +52,7 @@ #define SHIFT_MPTCP_MULTI_Z 16 #define SHIFT_MPTCP_MULTI 8 -#ifdef KDTRACE_HOOOKS +#ifdef KDTRACE_HOOKS #define __dtrace #else #define __dtrace __unused @@ -1403,11 +1403,7 @@ static void sctp_set_rtcc_initial_cc_param(struct sctp_tcb *stcb, struct sctp_nets *net) { -#ifdef KDTRACE_HOOOKS - uint64_t vtag, probepoint; -#else - uint64_t vtag __unused, probepoint __unused; -#endif + uint64_t vtag __dtrace, probepoint __dtrace; sctp_set_initial_cc_param(stcb, net); stcb->asoc.use_precise_time = 1;