From nobody Tue Apr 19 12:46:10 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 B426711CF175; Tue, 19 Apr 2022 12:46:13 +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 4KjNpD1f6Bz4Shh; Tue, 19 Apr 2022 12:46:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650372373; 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=+hOxpMo1DpW/hRRAv9Ik41x1aCYklOVu7Sagv2yNkkM=; b=lW2Ui4nAVhFWQeYDz+xaN6WeB17h+Xe41IE0YKYvtt7JXHv0QCsaER5uBUWs8A4ky6mRPO 6343v9kZq4X808HAC/2iNd6MoJjz6bqYogu+AEHj7fVTRYoul0OTHKcqHkQ/peZ6WiBT7i IqBQl2ssWRjEfWCcHhJp9FAnhtCb9aF97ykIctZZ0hIDikzUkyLVLsqHPdAQb88cLzP5bP ZCOMqk6ATHOg2SoGOD4znV5psNKqfA3yWS1rGkbmTNo44MmiZWyGIwWflZdxy/xVlSfjWT aAiVUCHy08Edb61mI8y5HCSbmuMbnRKD9Jn0uGYIGvBFBZklmhX591+FKilA3g== 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 DB90C27A1C; Tue, 19 Apr 2022 12:46:10 +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 23JCkApn030533; Tue, 19 Apr 2022 12:46:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23JCkAUe030532; Tue, 19 Apr 2022 12:46:10 GMT (envelope-from git) Date: Tue, 19 Apr 2022 12:46:10 GMT Message-Id: <202204191246.23JCkAUe030532@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: b338b1fd500a - main - tcp: plug set-but-not-used vars 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: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b338b1fd500a70726829e38c6eaf7ed31ab0e9f0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650372373; 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=+hOxpMo1DpW/hRRAv9Ik41x1aCYklOVu7Sagv2yNkkM=; b=DAOD1obNTDUMtYV+YWl3wNud9l4Ad4AtPCtN5HfuciIcAX0cPB/FlhBGpinYdhZkPcjPGp x0AcPOSK1gzbFJlL0RCG9YqKejallr4ur9c8oB7kO3Bd9GlCZ9d45wkmRjb/+OnfVcsMd5 AfCwQ/aLaU56szT480CKueh5L4maIsyxbtD6A1gBWxw7EaulXf+2F4SFKMRe03cZ/R4hXp T64zwgRDVrXLgbjGQ+9qLTNJjYyQN3FQ+RxbizHmLJldzvPuQL4KmBQX/8N0cfqPrz/OLn jQ3zLe2o2LsfuerLHzgFpyVetMbSuSQwXzMPFwMXoMBR04mL68CnhdqJcgNqMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650372373; a=rsa-sha256; cv=none; b=Ooa1Mw8Sg6ccG8suix5J8zES26pIqXBb8rtFk1IlXJchY/CG4WIc9wRIiAWliSrQrDcmzA SlJ5ymcBjjCk+2NQMVyKna759dtNLvwUEmnlDOWyxvDw5ggebK2EO3rnhKSrOwGvuxCQW8 otjl+cR2S2cswcmRmfTg5NvutQw0l7aUG7jVgJeYBKnVs1RXgPhhOAN9+Pn3CmSKxuMlNF FY4g2PI+47/jHIxziBqszgAWZQl3vAmbIfG/3oC4TD1tAIzJyjfMkITFtNf1/BMYaEJMRj VmHnirYCyyxAO3C+2RTwKpoSogICMTWSsnWBM3WFtvlGqs2PCFmWBHPiw6FvDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=b338b1fd500a70726829e38c6eaf7ed31ab0e9f0 commit b338b1fd500a70726829e38c6eaf7ed31ab0e9f0 Author: Mateusz Guzik AuthorDate: 2022-04-19 12:36:17 +0000 Commit: Mateusz Guzik CommitDate: 2022-04-19 12:45:57 +0000 tcp: plug set-but-not-used vars Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netinet/tcp_usrreq.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index 8c8cba8ea5ad..e559d8f1fe76 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -301,7 +301,9 @@ 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; @@ -333,7 +335,9 @@ tcp_usr_bind(struct socket *so, struct sockaddr *nam, struct thread *td) error = EINVAL; goto out; } +#ifdef KDTRACE_HOOKS tp = intotcpcb(inp); +#endif TCPDEBUG1(); INP_HASH_WLOCK(&V_tcbinfo); error = in_pcbbind(inp, nam, td->td_ucred); @@ -353,7 +357,9 @@ 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; @@ -379,7 +385,9 @@ tcp6_usr_bind(struct socket *so, struct sockaddr *nam, struct thread *td) error = EINVAL; goto out; } +#ifdef KDTRACE_HOOKS tp = intotcpcb(inp); +#endif TCPDEBUG1(); INP_HASH_WLOCK(&V_tcbinfo); inp->inp_vflag &= ~INP_IPV4; @@ -792,7 +800,9 @@ 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; TCPDEBUG0; @@ -807,7 +817,9 @@ tcp_usr_accept(struct socket *so, struct sockaddr **nam) error = ECONNABORTED; goto out; } +#ifdef KDTRACE_HOOKS tp = intotcpcb(inp); +#endif TCPDEBUG1(); /* @@ -834,7 +846,9 @@ 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; @@ -853,7 +867,9 @@ tcp6_usr_accept(struct socket *so, struct sockaddr **nam) error = ECONNABORTED; goto out; } +#ifdef KDTRACE_HOOKS tp = intotcpcb(inp); +#endif TCPDEBUG1(); /*