From nobody Fri Apr 7 19:21:37 2023 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 4PtSsY2nc1z4441Y; Fri, 7 Apr 2023 19:21:37 +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 4PtSsY26y3z3jqN; Fri, 7 Apr 2023 19:21:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680895297; 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=q3x1QAAUwgOdrbsY5hdrEY8bSRMyMiYP0/Ul6PqXT70=; b=WD/SP0zulR5L7q8+CzTkqIRWZPOh4nGvIwcGPFd+b2i4NO8VTgLZYTrmsdZXtMjqrdMbty 2UbaewWMkj7V7LTMl4akr7l6y10OIzTrYdrIio4+km1ThxIEtsU0+E6o/AGbJn9dvyhncv T17L/MucW3bcCMbS6kCBmReF+M56IBt7gCPx7XYV/1Asu5RyiK4I+FMNGXmdchrFnpP8LC MlopPG6FFyF0xE/YcEOUa8UpE++sgwsJIbwahhHhqEQ96tAPUmB0UFiIOAW+VvD5w47YQb 6r7QwSzFKofuHxPVz2/CgZK6Si42YVsa7+F31HvLgrgHDg4nXI2craydwaoUtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680895297; 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=q3x1QAAUwgOdrbsY5hdrEY8bSRMyMiYP0/Ul6PqXT70=; b=H1FJajHZgj4oHzI0TiAY/Cf/bk4vgWscK3n24GsRkQ7h5WvmmrBVr4nMIkg+qkt4Qb2+Q9 9dEO80LpSvRnbkrkZhbZwL28XYNCmPotypSeJ7Yhv1MZaKx3i+8Jh6mTfyiiQcj8OK6tmV /iyQE7wfFY/eRTSxVs2svOCLOd4VNzmuyk6Q+BLMCm1NRV3vRY87cZ/ccZtVHluhpNEyIq n1OVkFVj08IiYZkjmQMad5CAEK+V+H2loG7PSdBRYTzPzSXQszftI2C4HCLGnps8xyy05x 0M5aGdpRA0iEaf3j/paSDAv7aZKLX2vG9gXSY9t4zCAyxPKe0Ts29U37lCDoxw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680895297; a=rsa-sha256; cv=none; b=D48oWvikx92cttfjOTXcFBFyPTAxU6jRtoEr/fs3AYxZqtWKJG0BP+n9BOcjy5YiATTOm9 gTsX0NYdGiv1jyV2BIQMJ1ETFH3ohg/9ty0W1W458FD/2ceOtk6wOM1f4FvCtistJpLwot imgVOt/mYMPKLvi50zg/pIYod3A2dZXdZ+xz/dzGYT7vVm05ipw6l6G30g43QXPWshbwly kMBp6Vz8tWamjBpFC1RdpoLzFCNqMLVkEdy9ZsxYhlNY93hsDjI/Kh/vDHdOcflD4Ast4d mcjbAlEn7zgKlOWvd96ZLtEhmyXuUubjgO/4P9JlDsse0XReo7k4zqcpu7yGeA== 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 4PtSsY0wfvzxDC; Fri, 7 Apr 2023 19:21:37 +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 337JLbAA007576; Fri, 7 Apr 2023 19:21:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 337JLbxe007575; Fri, 7 Apr 2023 19:21:37 GMT (envelope-from git) Date: Fri, 7 Apr 2023 19:21:37 GMT Message-Id: <202304071921.337JLbxe007575@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: de4368dd84a0 - main - tcp: retire tfb_tcp_hpts_do_segment() 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: de4368dd84a0b3eec8069489e212b1c951f4bb4b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=de4368dd84a0b3eec8069489e212b1c951f4bb4b commit de4368dd84a0b3eec8069489e212b1c951f4bb4b Author: Gleb Smirnoff AuthorDate: 2023-04-07 19:18:02 +0000 Commit: Gleb Smirnoff CommitDate: 2023-04-07 19:18:02 +0000 tcp: retire tfb_tcp_hpts_do_segment() Isn't in use anymore. Correct comments that mention it. Reviewed by: rrs Differential Revision: https://reviews.freebsd.org/D39433 --- sys/netinet/tcp_stacks/rack_bbr_common.c | 7 +++---- sys/netinet/tcp_var.h | 4 ---- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/sys/netinet/tcp_stacks/rack_bbr_common.c b/sys/netinet/tcp_stacks/rack_bbr_common.c index d4a70c529386..1bc0823eef2a 100644 --- a/sys/netinet/tcp_stacks/rack_bbr_common.c +++ b/sys/netinet/tcp_stacks/rack_bbr_common.c @@ -334,13 +334,12 @@ ctf_process_inbound_raw(struct tcpcb *tp, struct socket *so, struct mbuf *m, int * We process each one by: * a) saving off the next * b) stripping off the ether-header - * c) formulating the arguments for - * the tfb_tcp_hpts_do_segment - * d) calling each mbuf to tfb_tcp_hpts_do_segment + * c) formulating the arguments for tfb_do_segment_nounlock() + * d) calling each mbuf to tfb_do_segment_nounlock() * after adjusting the time to match the arrival time. * Note that the LRO code assures no IP options are present. * - * The symantics for calling tfb_tcp_hpts_do_segment are the + * The symantics for calling tfb_do_segment_nounlock() are the * following: * 1) It returns 0 if all went well and you (the caller) need * to release the lock. diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h index 6018e84bfe64..cc3d7c294eea 100644 --- a/sys/netinet/tcp_var.h +++ b/sys/netinet/tcp_var.h @@ -602,10 +602,6 @@ struct tcp_function_block { struct socket *, struct tcpcb *, int, int, uint8_t, int, struct timeval *); - void (*tfb_tcp_hpts_do_segment)(struct mbuf *, struct tcphdr *, - struct socket *, struct tcpcb *, - int, int, uint8_t, - int, struct timeval *); int (*tfb_tcp_ctloutput)(struct inpcb *inp, struct sockopt *sopt); /* Optional memory allocation/free routine */ int (*tfb_tcp_fb_init)(struct tcpcb *, void **);