From nobody Mon Jul 17 17:35:50 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 4R4Tkt56g1z4nTVc; Mon, 17 Jul 2023 17:35:50 +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 4R4Tkt4hrRz4ZRd; Mon, 17 Jul 2023 17:35:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689615350; 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=PAon1OZUhZ1cwWClhIpT2Rd4gNpgG4VP2VsYsPejzuE=; b=d2zd95Fl3tYnlg9Hqqe3d0m6gImRVJs6xCY46hY+NkTd2Rdzd8UvGP1wF2eXkJec5uwzGw weVjQdD1JGKRM5wfeF3Ip5No9DJKZ1kBGI9gFlkSb5/RhYiANzKI6GQ20pZ75qjT/9M4yj gx5F/rhMipLTzmwlt/LAFpnLGmvbMzHnxgtJfZWYUIJIH/OaaO70Gnf47kRbhU5KLhCNqC g6RwI8hKuSoG25UrErd+4kmL7rjGJROWTzRriU51OhRjZP5DGHCMaiulda/VMW154Bw2qw kbYsnty3wIfN4MdDGfLuIjGjrMa9z1+3+A3w24A6noaa2YTKI20MwLLzvhTJZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689615350; 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=PAon1OZUhZ1cwWClhIpT2Rd4gNpgG4VP2VsYsPejzuE=; b=XokUtW8Mt6v8E2gDIbrTLUTDqDIbNWhCs2oq7mCmXZdXrkp+u1TIUvXHICWHTEmcSgvK+K 04nUy8jsfvxF+yKqDUWee3iMjucbq5SU9sbnjdCf8uB4vvOmvPHPWDI0qoVo92xmyXF26Z ITpBuRBHaaEx7ehmbTKNCvBL+ZqyLvIJ4NvaPLA5SNrM59ZAqjM9AVE/vmuPlfngyGrx68 kO4AYCy2hSbT8QilYZ7imyzsGpQWF07SSOAzLPceRzkCfqDm7wPnut5Hb9/LDJOpps5KQG o9YyO1tBT6/WhjtQNwyGoljBt4s5yXOW0293QOSrCst0pv/ifj2V8MY4TTHWKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689615350; a=rsa-sha256; cv=none; b=RPhkPTHVLF44ns3Z0eSKZRwRQvJm4nGADuFUu34tqY/3phTSneVNa5WUyPHEa+7AjwD6+N l1ELF/GSLw8Dq8LIx/jXZ4IbspLlj+2e1JBsXgky+sqZjCKpT1KwHEJkdDajHi4MGB0l5F pULEwHrCtGM4zfzch7oYBzOj2FYLi9nVH+Ts9lP1bzXg2YyDaq8q3brZjdFfyVIqRrPm1G gvS53YS6I0TgsRxIFarqxHsIcASinBSNlm9UXL3Sy1i0DQGBob17ZrmF4NXItFQAzdJXRn s6/il3KeFM7WfYzXvd6CHspL84V2PKk+29lYKzs3dzgGIgpPPwXvRKCGukiOGA== 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 4R4Tkt3np9zXK9; Mon, 17 Jul 2023 17:35:50 +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 36HHZoXM063455; Mon, 17 Jul 2023 17:35:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36HHZonv063454; Mon, 17 Jul 2023 17:35:50 GMT (envelope-from git) Date: Mon, 17 Jul 2023 17:35:50 GMT Message-Id: <202307171735.36HHZonv063454@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: d3152ab23e0e - main - tcbpcb: Always define t_osd 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d3152ab23e0e7bee5a0f988ecca2a1187ab82057 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=d3152ab23e0e7bee5a0f988ecca2a1187ab82057 commit d3152ab23e0e7bee5a0f988ecca2a1187ab82057 Author: Warner Losh AuthorDate: 2023-07-17 17:22:45 +0000 Commit: Warner Losh CommitDate: 2023-07-17 17:22:45 +0000 tcbpcb: Always define t_osd Always define t_osd. congestion control modules access it unconditionally. This fixes the build. However, this is, at best, a temporary band-aide until the larger issues are sorted. Sponsored by: Netflix --- sys/netinet/tcp_var.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h index 587998331fbf..8e89f2aef0f2 100644 --- a/sys/netinet/tcp_var.h +++ b/sys/netinet/tcp_var.h @@ -482,9 +482,7 @@ struct tcpcb { struct mbufq t_inpkts; /* List of saved input packets. */ struct mbufq t_outpkts; /* List of saved output packets. */ #endif -#ifdef TCP_HHOOK struct osd t_osd; /* storage for Khelp module data */ -#endif uint8_t _t_logpoint; /* Used when a BB log points is enabled */ #ifdef TCP_REQUEST_TRK /* Response tracking addons. */