Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 17 Jul 2023 17:35:50 GMT
From:      Warner Losh <imp@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: d3152ab23e0e - main - tcbpcb: Always define t_osd
Message-ID:  <202307171735.36HHZonv063454@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=d3152ab23e0e7bee5a0f988ecca2a1187ab82057

commit d3152ab23e0e7bee5a0f988ecca2a1187ab82057
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2023-07-17 17:22:45 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
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. */



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202307171735.36HHZonv063454>