From owner-dev-commits-src-all@freebsd.org Wed Jun 2 03:40:58 2021
Return-Path: <owner-dev-commits-src-all@freebsd.org>
Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8A450638673;
Wed, 2 Jun 2021 03:40:58 +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 4FvvvG3ZNCz3QL1;
Wed, 2 Jun 2021 03:40:58 +0000 (UTC) (envelope-from git@FreeBSD.org)
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 6378775F2;
Wed, 2 Jun 2021 03:40:58 +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 1523ewHj023432;
Wed, 2 Jun 2021 03:40:58 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1523ew0P023431;
Wed, 2 Jun 2021 03:40:58 GMT (envelope-from git)
Date: Wed, 2 Jun 2021 03:40:58 GMT
Message-Id: <202106020340.1523ew0P023431@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Alexander Motin <mav@FreeBSD.org>
Subject: git: 52e8b0627784 - stable/12 - Fix packet cbs/ebs conversion.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: mav
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/12
X-Git-Reftype: branch
X-Git-Commit: 52e8b06277847d9332d3678c01f185a3cce3ec28
Auto-Submitted: auto-generated
X-BeenThere: dev-commits-src-all@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: Commit messages for all branches of the src repository
<dev-commits-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-src-all>,
<mailto:dev-commits-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-src-all/>
List-Post: <mailto:dev-commits-src-all@freebsd.org>
List-Help: <mailto:dev-commits-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all>,
<mailto:dev-commits-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 02 Jun 2021 03:40:58 -0000
The branch stable/12 has been updated by mav:
URL: https://cgit.FreeBSD.org/src/commit/?id=52e8b06277847d9332d3678c01f185a3cce3ec28
commit 52e8b06277847d9332d3678c01f185a3cce3ec28
Author: Alexander Motin <mav@FreeBSD.org>
AuthorDate: 2021-05-19 15:00:21 +0000
Commit: Alexander Motin <mav@FreeBSD.org>
CommitDate: 2021-06-02 03:40:50 +0000
Fix packet cbs/ebs conversion.
Each packet is counted as 128 bytes by the code, not 125. Not sure
what I was thinking about here 14 years ago. May be just a typo.
Reported by: Dmitry Luhtionov <dmitryluhtionov@gmail.com>
MFC after: 2 weeks
(cherry picked from commit 4a6830761c6552bfe2c118a73a5a461694cb84c7)
---
sys/netgraph/ng_car.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/sys/netgraph/ng_car.c b/sys/netgraph/ng_car.c
index d3ac2b7042a4..6c814870e65d 100644
--- a/sys/netgraph/ng_car.c
+++ b/sys/netgraph/ng_car.c
@@ -492,14 +492,14 @@ ng_car_rcvmsg(node_p node, item_p item, hook_p lasthook)
if (bconf->downstream.opt & NG_CAR_COUNT_PACKETS) {
bconf->downstream.cir *= 1024;
bconf->downstream.pir *= 1024;
- bconf->downstream.cbs *= 125;
- bconf->downstream.ebs *= 125;
+ bconf->downstream.cbs *= 128;
+ bconf->downstream.ebs *= 128;
}
if (bconf->upstream.opt & NG_CAR_COUNT_PACKETS) {
bconf->upstream.cir *= 1024;
bconf->upstream.pir *= 1024;
- bconf->upstream.cbs *= 125;
- bconf->upstream.ebs *= 125;
+ bconf->upstream.cbs *= 128;
+ bconf->upstream.ebs *= 128;
}
if ((bconf->downstream.cir > 1000000000) ||
(bconf->downstream.pir > 1000000000) ||