From nobody Wed Feb 09 11:19:37 2022 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 481B319B80E1; Wed, 9 Feb 2022 11:19:38 +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 4Jty8B1TTpz4cty; Wed, 9 Feb 2022 11:19:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644405578; 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=BMk2wEcJySORS4juKu/xy0LDHjTP9VuRq95e9aih+RY=; b=gZqCWiBxwEx5Dzwr0g3AI3+KUfGZRo4v7v//8PRQBwaRV1c9m01/eZOKOaZbS7WbI+/VoQ 4ku3hhoNYPpW3OCaHnGGGpP1MNBMfFQan/nQ3aoAnoN++TemnJtCHPalLt9BJ/BEpVzWUZ gRv+fMTh77V+zoBZBf8zk5x8DISy2i5tiTii222Y2WHd7hT/vyglRKsNuDh7qrsnyQpfn1 wnnMWKlubaG6SCCf0IVphw2hw4Lir2+lNGEJZlyNItGEMh8DR68T0mBAPQjmGHiDwq9Qt9 2xuY+sR2nMGMABYAFM6jweQhlDDbf00q13H8qophbiOSRnPYZEagYhUuC1M7tQ== 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 1313844A6; Wed, 9 Feb 2022 11:19:38 +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 219BJbI1026151; Wed, 9 Feb 2022 11:19:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 219BJb9G026150; Wed, 9 Feb 2022 11:19:37 GMT (envelope-from git) Date: Wed, 9 Feb 2022 11:19:37 GMT Message-Id: <202202091119.219BJb9G026150@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: 528c76492402 - main - tcp: fix compliation when KERN_TLS is not defined 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: 528c76492402d9be8ec83a0a769f0d70e2a32f61 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644405578; 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=BMk2wEcJySORS4juKu/xy0LDHjTP9VuRq95e9aih+RY=; b=uxA5rZEy84KEG7HZIRw42qQ4lGcRyyonpV3FsfTl2ah3/3YhYs/flzBW8BJJ8FetdhbUVn WgbYErQeCxISzqh4tGg9j0nuTizugCY7t4kaacdkL2V4OU8l0dq2MXRW69dUlZsXohmwo0 uhS6TV9gpUUk3kWOpcNtcq3KdzJYTnmZ/+aVg8n/8YW56Q1+osmOiPo/bN75cp+08YZnCO 87y+o5zSqg/mQ1eUD/cnjhWVXnTGl+JT3MXLSa17DDjF2tOxvz7Loop1PabAkKTz9YmAL0 5JLsknPuuU1m6ha7e3Rdwl1N+KxTWaMO4WSVhbAhztfc3SpN76ihGLy08n2R0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644405578; a=rsa-sha256; cv=none; b=JdZbQuCfZoo0HfZMHtT+Bk82DZeq1BcA5b/0b3NWf6ghkI553BOge48WIKZZ0hhICTjWix jL2xgtzRbYnZZBS7o7bGgd/9A7UHuJOj11FKWhRw2nMg+XfmZPj+VZBLYef09uhKMe0cp5 tWrjbGpC72MxkJrLzbq8T7XmVrSjPfu0/k3DSpKoDt1XykI9xzoDvSMcT8xwTAxjJfBdbW D1+nP2jaypO2EFuXFp6ltyxPPHpMyUahnH2xf4MQV/C8z28p1Fich+c6/5NL04X4QYXLjL +OhDubp9s8jFC9jWU1AGqYJeuYMx8zVviMm2F7Lak0mMHU9xKsLUORbC6rN+jg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=528c76492402d9be8ec83a0a769f0d70e2a32f61 commit 528c76492402d9be8ec83a0a769f0d70e2a32f61 Author: Michael Tuexen AuthorDate: 2022-02-09 11:16:43 +0000 Commit: Michael Tuexen CommitDate: 2022-02-09 11:16:43 +0000 tcp: fix compliation when KERN_TLS is not defined Reported by: Gary Jennejohn Fixes: fd7daa727126 - main - tcp: make tcp_ctloutput_set() non-static Sponsored by: Netflix, Inc. --- sys/netinet/tcp_usrreq.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index 564225f39c88..c88ab5219152 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -2119,13 +2119,13 @@ no_mem_needed: int tcp_default_ctloutput(struct inpcb *inp, struct sockopt *sopt) { - struct socket *so = inp->inp_socket; struct tcpcb *tp = intotcpcb(inp); int error, opt, optval; u_int ui; struct tcp_info ti; #ifdef KERN_TLS struct tls_enable tls; + struct socket *so = inp->inp_socket; #endif char *pbuf, buf[TCP_LOG_ID_LEN]; #ifdef STATS @@ -2136,7 +2136,7 @@ tcp_default_ctloutput(struct inpcb *inp, struct sockopt *sopt) INP_WLOCK_ASSERT(inp); KASSERT((inp->inp_flags & (INP_TIMEWAIT | INP_DROPPED)) == 0, ("inp_flags == %x", inp->inp_flags)); - KASSERT(so != NULL, ("inp_socket == NULL")); + KASSERT(inp->inp_socket != NULL, ("inp_socket == NULL")); switch (sopt->sopt_level) { #ifdef INET6