From nobody Wed Apr 24 13:17:07 2024 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 4VPffD1rrBz5HKyy; Wed, 24 Apr 2024 13:17:08 +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 4VPffD11Tyz4LQl; Wed, 24 Apr 2024 13:17:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713964628; 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=+HrqYYj9yBMc/Yd8kYNS9QFviZ5xHOsaUpvrTNMNY1A=; b=JH292eo/gjKgtSpwF9aQsnzeIGjsKfKoUBgmLlJiBl1IIjz0qNy2xPxZFeDlIOdEdFctXU arLEZNLbPShud4DGqVgg4zjsVl04l/56vsLdWvtbLlBCiY1eLeILCGNH7pzUMSO4RRVhCs NkpiHpnjUPh5xxFvfkp9TboDkwZVSv+22mwyjx09PQ88+SYbzCpECyGz5rHB91rRCmK0au uJLc0olx4nn2wlL990gSfLYJc1yQrDzdv98XuthEGx+CM8hC5C9KP+ph6ej9JuGCAQLEP3 xm4WdZWPrid+TAQO5+LWcOmOIBkLXU+L2fgf1sw5fy3kcapvY9g00JtONryAiw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713964628; a=rsa-sha256; cv=none; b=LNOekzkCMRZWO1KAbhOaVQfM4uatZWUxzYtgMDRg1ATINBJGL29QSpgUO+R4+v0YzyFz4a rji8eQ6+4fyrrqJ471FL8lRB/MVn2iZiWRF1Qso8d3zeI0pa8LspT8hwfZyC5OqMC7zJMx G1AixQkbDZDUQ2DKiaN+QEepe1umOrbFlgvElNZvKAmIoqAJGS2FYG1Q1xCcyKqOJKzn/J R+01LcthJkilaZyiEmG/2BgG9Zu40t6ZIK9ioNjYIyglTq6YiYB81SFbSv0h6Je04gWzfP +e3v0ThXCxzOn0D1FeGyo0+1FJghKHLLsJQPxDYDRSkuKF5PnqYoGqw4+oa8Iw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713964628; 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=+HrqYYj9yBMc/Yd8kYNS9QFviZ5xHOsaUpvrTNMNY1A=; b=cJ9dBYF5sLMTTZBIPkuk+INxpQJewfTwmR/1i6Q+Kw5A9+0GB0csH9a7aL01Z5Hb0/mHVg 3kxZ7O95YBYhksxFwBTTDYFDth3W/SUv0X3FC8wSeBQZdY8ByC6sIo9tyEMm+ICLK8/P3r QXfZ1CHdIwkxOIQqpDzq3nqlma61AfhcBfrfQEThg2Sw4Ne8YedVJuYVmUZlHmsB9CpoOP NGxuaZkXZU9EIPCtdBf0zk8u8NPfmCPGzm96fzVLUyBr8k03xSh2oo/LLYjwQc7JaXnR1g oCNTh8B5O9KeB35s47eonXMKtO9jCGX1QHSifXyE8YjMGVbhqKidYHSXWbc+uQ== 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 4VPffD0K8hzH1D; Wed, 24 Apr 2024 13:17:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43ODH7mY053179; Wed, 24 Apr 2024 13:17:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43ODH7Pj053176; Wed, 24 Apr 2024 13:17:07 GMT (envelope-from git) Date: Wed, 24 Apr 2024 13:17:07 GMT Message-Id: <202404241317.43ODH7Pj053176@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 8512311fb500 - main - ng_pipe: Fix whitespace 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8512311fb5004444f43701eb122b6d77c76d7564 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=8512311fb5004444f43701eb122b6d77c76d7564 commit 8512311fb5004444f43701eb122b6d77c76d7564 Author: Martin Vahlensieck AuthorDate: 2024-04-17 18:50:39 +0000 Commit: Mark Johnston CommitDate: 2024-04-24 12:40:51 +0000 ng_pipe: Fix whitespace Signed-off-by: Martin Vahlensieck Reviewed by: markj MFC after: 2 weeks Pull Request: https://github.com/freebsd/freebsd-src/pull/1181 --- sys/netgraph/ng_pipe.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sys/netgraph/ng_pipe.c b/sys/netgraph/ng_pipe.c index a2966c9a0349..c2424e3db48a 100644 --- a/sys/netgraph/ng_pipe.c +++ b/sys/netgraph/ng_pipe.c @@ -34,7 +34,7 @@ * This node permits simple traffic shaping by emulating bandwidth * and delay, as well as random packet losses. * The node has two hooks, upper and lower. Traffic flowing from upper to - * lower hook is referenced as downstream, and vice versa. Parameters for + * lower hook is referenced as downstream, and vice versa. Parameters for * both directions can be set separately, except for delay. */ @@ -195,8 +195,8 @@ static const struct ng_cmdlist ngp_cmds[] = { { .cookie = NGM_PIPE_COOKIE, .cmd = NGM_PIPE_GET_STATS, - .name = "getstats", - .respType = &ng_pipe_stats_type + .name = "getstats", + .respType = &ng_pipe_stats_type }, { .cookie = NGM_PIPE_COOKIE, @@ -494,7 +494,7 @@ parse_cfg(struct ng_pipe_hookcfg *current, struct ng_pipe_hookcfg *new, if (new->qin_size_limit == -1) current->qin_size_limit = 0; - else if (new->qin_size_limit >= 5) + else if (new->qin_size_limit >= 5) current->qin_size_limit = new->qin_size_limit; if (new->qout_size_limit == -1) @@ -547,7 +547,7 @@ parse_cfg(struct ng_pipe_hookcfg *current, struct ng_pipe_hookcfg *new, } else if (new->bandwidth >= 100 && new->bandwidth <= 1000000000) current->bandwidth = new->bandwidth; - if (current->bandwidth | priv->delay | + if (current->bandwidth | priv->delay | current->duplicate | current->ber) hinfo->noqueue = 0; else @@ -686,9 +686,9 @@ ngp_rcvdata(hook_p hook, item_p item) } /* Drop a frame from the queue head/tail, depending on cfg */ - if (hinfo->cfg.drophead) + if (hinfo->cfg.drophead) ngp_h = TAILQ_FIRST(&ngp_f->packet_head); - else + else ngp_h = TAILQ_LAST(&ngp_f->packet_head, p_head); TAILQ_REMOVE(&ngp_f->packet_head, ngp_h, ngp_link); m1 = ngp_h->m; @@ -783,7 +783,7 @@ pipe_dequeue(struct hookinfo *hinfo, struct timeval *now) { hinfo->run.qin_octets -= m->m_pkthdr.len; ngp_f->packets--; } - + /* Calculate the serialization delay */ if (hinfo->cfg.bandwidth) { hinfo->qin_utime.tv_usec +=