From nobody Wed May 08 13:07:48 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 4VZFn065tXz5J5yf; Wed, 08 May 2024 13:07:48 +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 4VZFn01y7Hz4RHf; Wed, 8 May 2024 13:07:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715173668; 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=MScV+4zteSe96cfncBUFEr9G6wwjVIN1H958S2J9nEo=; b=NL6cHi5p5G6/CtspVvvIUBh9MGvrhhytEkjQYaXa+naOBgwZaPZ+t4Nq7l9EXQqSFBZMhf 6GAgs45qt2nyiJMxLkLyIfk3jT5utvfeRciJZrBIznoUKM+bLe5Qw5ZR6Xx4n7/pOG+Smj jx7stcZ3TiNmelfSw1b+lZ6boLDRy1fDzNhunqIgBLyWr0wXr4FBQWuWZqdVWl9vnRDJsu sSEe+Q3iRS1hy+ZVpe6Yy6SLLq/5pglSCd1O4fp/PAXTxhrBuSaud5Wf4qGNPmOeacf7Yi FVmqu5CWAgzZj/EUW79pvYSsDw3/PX9UT7RjeLdkxGW0AUsTpGnYKlPauLBsrg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715173668; a=rsa-sha256; cv=none; b=oa1NoM+nOB8mr5rAqP+Le9P4ES4kM0ljo8HtkwQcJxZCo1zT7olYqoc2MPtsUaawAGGUUy aN2iKK/vuJKAAYeJ7CbQE0GkDF7yx5JrOgdGRyl+jWnj0ntpHgL+OE0YWplVm4fjcLOxlp q2NTTXncXCcOUYCeX5Bhm/RI0uSHLdmKCKR7SSlgUzyMp8bSMy2Pc0sifh6EdxFbqvZPhk set2fpcH6XrvUXIhvuTgxtWeZhYtmBrhNcWoyE2ldcOUAPARMss31P3wANBM1zGlaoENCN PB8xLP3YMhC8tl1xpG6r9ScIugFrDbN5k6jc4RkBwRkr5rnbWi1Tac5omL0qDw== 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=1715173668; 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=MScV+4zteSe96cfncBUFEr9G6wwjVIN1H958S2J9nEo=; b=jJzzglXs5VQSD6wA5eE3vpX0OUuiuIv89eWsJmTaNbA2pN5kQSo7ck3MPWELIVPVh4+GSF rjsmzoEBJNrM2V9CbDKdVLcRUK6h5CiCfc6DwE8+/YGTyKPRTMK3ooFlM0ASUNkw4PyMAI vMZMAa2mpYruCTp8OQk2Y/VTIInpKfc/pXJ7Gqs1lnJvdGevj0KkTqodOYvbw6uNzxO1L+ a6R1rNHDP08QJVuw+Hitpi6QUf+iIuov6wvTLidUst9r+pOG/IBmJXNOuqfwRp/2pxcsj4 mym7Jn6po8Cr57t6HbQ4r2m9//hKe88psbZFk7p1cXXLM+NrpwMLUPU/APSHBg== 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 4VZFn01FqPzR1D; Wed, 8 May 2024 13:07:48 +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 448D7mfq080425; Wed, 8 May 2024 13:07:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 448D7mG6080422; Wed, 8 May 2024 13:07:48 GMT (envelope-from git) Date: Wed, 8 May 2024 13:07:48 GMT Message-Id: <202405081307.448D7mG6080422@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: a709ac6f422b - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: a709ac6f422be26eb5230f3b508e4d6112bbf353 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a709ac6f422be26eb5230f3b508e4d6112bbf353 commit a709ac6f422be26eb5230f3b508e4d6112bbf353 Author: Martin Vahlensieck AuthorDate: 2024-04-17 18:50:39 +0000 Commit: Mark Johnston CommitDate: 2024-05-08 13:06:16 +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 (cherry picked from commit 8512311fb5004444f43701eb122b6d77c76d7564) --- 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 +=