From nobody Tue Nov 08 20:35:56 2022 X-Original-To: dev-commits-src-main@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 4N6KcX737pz4YWxB; Tue, 8 Nov 2022 20:35:56 +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 4N6KcX6XtRz4lH4; Tue, 8 Nov 2022 20:35:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667939756; 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=p4ee4K6dExwN+kekIFGAp6y4hhKN3y5A+XJF2KpFwFw=; b=vNP92BaW5c7cQi7mCuXgdGVmAXm83uoXeYYyR/8o7ZbYCoBxWk8RmFpWZoZ3J3KvPEMmob 7SmT/4CbtA1Bv1Sjy4IHb3Rc8ToIO8AQ2E+o4PKgt/A8HAi9coFp3YDUNk/T8cORnXwiMA dmRC8ADLYhprx/EtbBzsMfPAjPr5Yj9OfQ53JaLRnDOFdY7RuqQj5zmS6exKIzmm20iy2w OCpanONH5f2KIZON8U/feF7MElm8eKO2z3INz/UtwiRmc7TmY/r+KF2QAnW1KGpbTBnaf3 ZmUYVvhMn14CsJSIvgcTpz7hH7bg42Ty40xEqGNIcwVJumMJvYP/+ihdYhVCiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667939756; 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=p4ee4K6dExwN+kekIFGAp6y4hhKN3y5A+XJF2KpFwFw=; b=coEtyXOM7otZWPHfCkp8deE2hk4yWag9CznHCgRt1cfH9dzo5KHvgFo9kyXVTUHUVre3km Twbr6HPwfoNwTN1RV1gFBqDEO7xS6xq0VfcWnrZROwGAmQ9LTtMr7GScyzASxV0+2CaFX0 dP5d8ps8v0NBpz9DxuLIYbpIFjJy0si6Kmhquaq3QCcNv7Rar39RwUWD3a0M+qc9C/F8q8 wgPh5PztNqbwzGrLg41Mk2P8n1lhxhCV3haIea38/ii1Hvk9JnPRkFbA1RB3NCvtpNArku MQ0zDxKG9rLrq7imfZ3S5Ts5U+2RaX5wzehgFadZYslnmY0ZzxLVOxpkMekN+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667939756; a=rsa-sha256; cv=none; b=bEyu690mWxhUn78pcdyyfajIArCkLK0csZsVBfPmczHPWKOHU6Ntfb7XBajiblGVNEg7kM xo8yS8J+Gg95cZdHDjTt0ZZ+jH4w0eehIx1Ro1olpeIh/X3tW9LovrrIRsPtn2rOuiR/89 ixk0SMfsuhTlVB/5qF17s8QjNwEIoJo2IbIxoiYM4RJ7Xnz4yizuSi/N+47/x3422MkVfc l402+dfJdeHYQO0kHlaRXjmf38oIcRbMkF8lEaVuvmuLWx/ZUO3TqJSpfeWcJmYWpBJCXc dNsHhwklZ6GxdOyDLyzZHd9W3aV56Fjo8Y7JsVV2CTVsFoVEI7Ih0SBNS4+HjQ== 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 4N6KcX5dx5zwM9; Tue, 8 Nov 2022 20:35:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2A8KZuGG027127; Tue, 8 Nov 2022 20:35:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A8KZudq027126; Tue, 8 Nov 2022 20:35:56 GMT (envelope-from git) Date: Tue, 8 Nov 2022 20:35:56 GMT Message-Id: <202211082035.2A8KZudq027126@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: b40ae8c9fe73 - main - tcp: fix build without INVARIANTS and VIMAGE List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b40ae8c9fe73e02a9e03efeef8e8fe4bda66d388 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=b40ae8c9fe73e02a9e03efeef8e8fe4bda66d388 commit b40ae8c9fe73e02a9e03efeef8e8fe4bda66d388 Author: Gleb Smirnoff AuthorDate: 2022-11-08 20:34:45 +0000 Commit: Gleb Smirnoff 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