From nobody Thu Feb 03 14:01:46 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 6196B19A597C; Thu, 3 Feb 2022 14:01:46 +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 4JqL222KZ3z4mty; Thu, 3 Feb 2022 14:01:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643896906; 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=ukxWsLOSFoP/Fxde7BM6i71FokthDhTvm7RHlEAa23k=; b=jawv2PLAgs1L06BuLyqTaO8gTZ7/p1maD2t05UqUkzE684H3CHPr4536UvVB9lrV5Vxvq7 3rkImewLGjvjU477C3tupV1wk6DN/dvEsYGI4uAaeQwJfxY7ytQvPCk9m5L5sNufFrZhw1 Wz/DCep6TY0CkqXOBp5nOYh7akHNh7Iv4IVrdkSE1Hjhm4+JLfNgEZAjF98GJLo9+5GO9W hxs+Aj5bhBNTmT7DXZjZFNYPxwA3MaXNhnAR1tM/1DGOA6xCmAYZ0+BiXafCHolLhaz4h/ +paPBfQy1R6vzwolABEGeEv2ooRWDR4z2JRE1MPS5mZTUDYtmzW8in6TXMFjdQ== 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 30A2F19296; Thu, 3 Feb 2022 14:01:46 +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 213E1k8W095121; Thu, 3 Feb 2022 14:01:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 213E1k88095120; Thu, 3 Feb 2022 14:01:46 GMT (envelope-from git) Date: Thu, 3 Feb 2022 14:01:46 GMT Message-Id: <202202031401.213E1k88095120@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: d51c80351fda - main - rack: fix compilation and small cleanup 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d51c80351fda10a861f9edd16d0c7000b97ea107 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643896906; 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=ukxWsLOSFoP/Fxde7BM6i71FokthDhTvm7RHlEAa23k=; b=YQfgFsZJtlsRJDNwN6pQwYMij78E4McUwjMXu3g1fJ3CZ3dSY9F9fjuvkC3lXWVpPI1iOV 0If93z3hPOatQVgUH40Cd6Y7e0o2bkArC2cGLSyCEqiBrs6y5EypL6EuMQlSywvJ0EevqE HvYkVqdtwRZMTaJ0EOA48WWSZQIGZRdPepda1RQVxkF+o3dKYIRwlGlCSjbHyzaq96BFgZ BgO/lcSn7jYxa1WDPL7THWBqm0yZ3GaXHOgmVRR2iHrRW79eWROQ3rNPCZSIigPDfIRSC1 7V9TYngyu4M95p8P2NqmzfSn3efAP75Uf/jy+2mXfz1H2nY3PNKM4NN9sJnpUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643896906; a=rsa-sha256; cv=none; b=t1edJR3gMDiMsaCYAEoVpDTwRspsceXp6qx11qQOTnzM242vGiq+aFlLmYzWAGRZYbYJ70 ovO6e2PrAWh7qiLZkCpnQvcUuPsHZ+ZiZUj/8CQmmV0ukIfbeCQPuFF5HgqjrcQdSN3Gt2 0t2YeYJRYA++HNdxLitj21HGguTO0HkIDe3tKrTwOHIRjmdRu+sT2DWbjlaTg/NCOFFYxc hTJNfNT54aM9A4VwFdBoHsK+EUy0TfF0fS+ZBj8wMyjBrBxifokBB9AhTyjV99+c5UdFGT AqsmKWDGr7xhG/jYIFYbvbSmueXHLYm8go4Ok6fNvk5zDw0tYrcsejzj4IQDcw== 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=d51c80351fda10a861f9edd16d0c7000b97ea107 commit d51c80351fda10a861f9edd16d0c7000b97ea107 Author: Michael Tuexen AuthorDate: 2022-02-02 08:41:40 +0000 Commit: Michael Tuexen CommitDate: 2022-02-02 08:41:40 +0000 rack: fix compilation and small cleanup Fix a function prototype missed in the last commit and whitespace change. Sponsored by: Netflix, Inc. --- sys/netinet/tcp_stacks/rack.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index 04174b8a76e8..93f5adc08a5b 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -475,8 +475,7 @@ rack_find_high_nonack(struct tcp_rack *rack, static struct rack_sendmap *rack_find_lowest_rsm(struct tcp_rack *rack); static void rack_free(struct tcp_rack *rack, struct rack_sendmap *rsm); static void rack_fini(struct tcpcb *tp, int32_t tcb_is_purged); -static int -rack_get_sockopt(struct sockopt *sopt, struct inpcb *inp); +static int rack_get_sockopt(struct inpcb *inp, struct sockopt *sopt); static void rack_do_goodput_measurement(struct tcpcb *tp, struct tcp_rack *rack, tcp_seq th_ack, int line, uint8_t quality); @@ -505,8 +504,7 @@ rack_proc_sack_blk(struct tcpcb *tp, struct tcp_rack *rack, uint32_t cts, int *moved_two); static void rack_post_recovery(struct tcpcb *tp, uint32_t th_seq); static void rack_remxt_tmr(struct tcpcb *tp); -static int -rack_set_sockopt(struct inpcb *inp, struct sockopt *sopt); +static int rack_set_sockopt(struct inpcb *inp, struct sockopt *sopt); static void rack_set_state(struct tcpcb *tp, struct tcp_rack *rack); static int32_t rack_stopall(struct tcpcb *tp); static void