From nobody Tue Feb 21 17:18:35 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 4PLmGN0GQgz3svrp; Tue, 21 Feb 2023 17:18:36 +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 4PLmGM6x6yz3hJk; Tue, 21 Feb 2023 17:18:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676999916; 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=nQ6/JhGi7kgXRJYSDtf7rD24+x1HjaVdenDi2fTiois=; b=s+zk33LdyqXQSJwjJu0ITxyPIYHZ7oXvvKIp2yt1L0gsQTvCQu7GNSDlasL0LDUmR6GSKM bsFPoF7PS9DglWHuSZJKvW7VOOkUvuW6T7P1sBatNYTXrvhlc9EKzbhHkmnS2hb59dLocn x+VnTIS7pQhtIQRuMqIXeAluOTbeUFL92ShsLWw6osLZDOLC+nFtb7gybsNuiL+5qz2qbj 4uxeyl8nDOqqlZlALeKGcIkwEGDzRel2gyDl71LinRxI7tJOwr+PlHGAh4w6fwgzi6Vj7L MiLe/AimT+ivBflFLkR18l6Gv2RVKBtlw5U+GfN5Za7lxZJ6KYPzrlV1qOO+nQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676999916; 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=nQ6/JhGi7kgXRJYSDtf7rD24+x1HjaVdenDi2fTiois=; b=Dsql9JJyvPc4MCDtWZg/qK6LBl+GIokg+wXWXA2Nrnunk33C1riPesVT4DMh/IhgyVWtyv m1im+L67XEyAsAMQYiRTkk3egMM7F6jxqitko21BXqtjisdQiOFtc/BiDxEisZemQiDZiM skBWDg4wqmTnrNkLZva6xm+U98R2Z7zNX/GD2AmC/NvxE+fnS0jwyG190xbOmC5I38mw5v q6kcRxJXINeRmcz5D31YztTvjR5W5HnfnHunQ7Oj6M/7k56RBVz6LdbLOTWcYcZ/4BeOEM ft4gUBj1qpvJ61qMTOU7G5h+HazaGoJ9MMixCWVdeMpOILknyaKuiUno06Izhw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676999916; a=rsa-sha256; cv=none; b=HGr+lb0ZfOB/niW9FFCnfsCO7HPxR4IPuOwXsnhnyjv6lAYB0skgSoB8kFWjRdpP4u0GZp KBRagHbZ2psID/rn5RiBB6NY9zYDXd12azvK2ivI/quuzy2Yw1i9M63edn3qo7K49bVGME 3vDr0Yz3AE5EnrqNGjStUtGOw1RwjhIdIdqkDm+F8yUctWi81jhBFrT4PEyIt2XQ1fOiQs BZUJiZXdHIrLUgCes4tAEfVIO28hZQjixt9ceeCc+SfFSxVo8bl3tUDjruGX61/gvVGAWG smTtEIKzJ9i1pOYlkXKc3UAKJO9WHjmY23kFE8qvTyNJNqJJnc9QRDff+i3RHQ== 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 4PLmGM60DZzT1Q; Tue, 21 Feb 2023 17:18:35 +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 31LHIZYv094326; Tue, 21 Feb 2023 17:18:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31LHIZZK094325; Tue, 21 Feb 2023 17:18:35 GMT (envelope-from git) Date: Tue, 21 Feb 2023 17:18:35 GMT Message-Id: <202302211718.31LHIZZK094325@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: 4065becf3f3d - main - bblog: unbreak build 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: 4065becf3f3d4a742a500e18206eae9dfdb7da11 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=4065becf3f3d4a742a500e18206eae9dfdb7da11 commit 4065becf3f3d4a742a500e18206eae9dfdb7da11 Author: Michael Tuexen AuthorDate: 2023-02-21 17:13:23 +0000 Commit: Michael Tuexen CommitDate: 2023-02-21 17:16:59 +0000 bblog: unbreak build Ensure that tp is always declared and set. Reported by: Michael Butler Sponsored by: Netflix, Inc. --- sys/netinet/tcp_usrreq.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index 60bb59b64868..878e5095eef2 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -229,9 +229,7 @@ tcp_usr_bind(struct socket *so, struct sockaddr *nam, struct thread *td) { int error = 0; struct inpcb *inp; -#ifdef KDTRACE_HOOKS struct tcpcb *tp = NULL; -#endif struct sockaddr_in *sinp; sinp = (struct sockaddr_in *)nam; @@ -262,9 +260,7 @@ tcp_usr_bind(struct socket *so, struct sockaddr *nam, struct thread *td) error = EINVAL; goto out; } -#ifdef KDTRACE_HOOKS tp = intotcpcb(inp); -#endif INP_HASH_WLOCK(&V_tcbinfo); error = in_pcbbind(inp, sinp, td->td_ucred); INP_HASH_WUNLOCK(&V_tcbinfo); @@ -283,9 +279,7 @@ tcp6_usr_bind(struct socket *so, struct sockaddr *nam, struct thread *td) { int error = 0; struct inpcb *inp; -#ifdef KDTRACE_HOOKS struct tcpcb *tp = NULL; -#endif struct sockaddr_in6 *sin6; u_char vflagsav; @@ -310,9 +304,7 @@ tcp6_usr_bind(struct socket *so, struct sockaddr *nam, struct thread *td) error = EINVAL; goto out; } -#ifdef KDTRACE_HOOKS tp = intotcpcb(inp); -#endif INP_HASH_WLOCK(&V_tcbinfo); inp->inp_vflag &= ~INP_IPV4; inp->inp_vflag |= INP_IPV6; @@ -702,9 +694,7 @@ tcp_usr_accept(struct socket *so, struct sockaddr **nam) { int error = 0; struct inpcb *inp = NULL; -#ifdef KDTRACE_HOOKS struct tcpcb *tp = NULL; -#endif struct in_addr addr; in_port_t port = 0; @@ -718,9 +708,7 @@ tcp_usr_accept(struct socket *so, struct sockaddr **nam) error = ECONNABORTED; goto out; } -#ifdef KDTRACE_HOOKS tp = intotcpcb(inp); -#endif /* * We inline in_getpeeraddr and COMMON_END here, so that we can @@ -746,9 +734,7 @@ tcp6_usr_accept(struct socket *so, struct sockaddr **nam) { struct inpcb *inp = NULL; int error = 0; -#ifdef KDTRACE_HOOKS struct tcpcb *tp = NULL; -#endif struct in_addr addr; struct in6_addr addr6; struct epoch_tracker et; @@ -766,9 +752,7 @@ tcp6_usr_accept(struct socket *so, struct sockaddr **nam) error = ECONNABORTED; goto out; } -#ifdef KDTRACE_HOOKS tp = intotcpcb(inp); -#endif /* * We inline in6_mapped_peeraddr and COMMON_END here, so that we can