Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 2 Jun 2021 03:40:58 GMT
From:      Alexander Motin <mav@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 52e8b0627784 - stable/12 - Fix packet cbs/ebs conversion.
Message-ID:  <202106020340.1523ew0P023431@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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) ||



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202106020340.1523ew0P023431>