git: b40ae8c9fe73 - main - tcp: fix build without INVARIANTS and VIMAGE
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 08 Nov 2022 20:35:56 UTC
The branch main has been updated by glebius:
URL: https://cgit.FreeBSD.org/src/commit/?id=b40ae8c9fe73e02a9e03efeef8e8fe4bda66d388
commit b40ae8c9fe73e02a9e03efeef8e8fe4bda66d388
Author: Gleb Smirnoff <glebius@FreeBSD.org>
AuthorDate: 2022-11-08 20:34:45 +0000
Commit: Gleb Smirnoff <glebius@FreeBSD.org>
CommitDate: 2022-11-08 20:34:45 +0000
tcp: fix build without INVARIANTS and VIMAGE
Lines from upcoming changes crept in and broke certain builds.
Fixes: 9eb0e8326d0fe73ae947959c1df327238d3b2d53
---
sys/netinet/tcp_timer.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/sys/netinet/tcp_timer.c b/sys/netinet/tcp_timer.c
index cf11dee8af68..9cfdc04fc6f5 100644
--- a/sys/netinet/tcp_timer.c
+++ b/sys/netinet/tcp_timer.c
@@ -250,9 +250,7 @@ tcp_timer_delack(void *xtp)
{
struct epoch_tracker et;
struct tcpcb *tp = xtp;
-#if defined(INVARIANTS) || defined(VIMAGE)
struct inpcb *inp = tptoinpcb(tp);
-#endif
INP_WLOCK(inp);
CURVNET_SET(inp->inp_vnet);
@@ -536,9 +534,7 @@ tcp_timer_persist(void *xtp)
{
struct epoch_tracker et;
struct tcpcb *tp = xtp;
-#if defined(INVARIANTS) || defined(VIMAGE)
struct inpcb *inp = tptoinpcb(tp);
-#endif
bool progdrop;
int outrv;
#ifdef TCPDEBUG