From 5a361720e2feea790ce72294db5add43f573c21b Mon Sep 17 00:00:00 2001 From: Jarek Poplawski Date: Mon, 25 May 2009 22:47:01 -0700 Subject: [PATCH] --- yaml --- r: 150486 b: refs/heads/master c: a1dcb6628b9489504a3be2515580fc4de891f94a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/core/gen_estimator.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3a45180b453b..5f195fdc3759 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dfa9264fe1a0c1b46e11c6a4cd3251cd5e1afb71 +refs/heads/master: a1dcb6628b9489504a3be2515580fc4de891f94a diff --git a/trunk/net/core/gen_estimator.c b/trunk/net/core/gen_estimator.c index 6d62d4618cfc..78e5bfc454ae 100644 --- a/trunk/net/core/gen_estimator.c +++ b/trunk/net/core/gen_estimator.c @@ -128,12 +128,12 @@ static void est_timer(unsigned long arg) npackets = e->bstats->packets; brate = (nbytes - e->last_bytes)<<(7 - idx); e->last_bytes = nbytes; - e->avbps += ((s64)(brate - e->avbps)) >> e->ewma_log; + e->avbps += (brate >> e->ewma_log) - (e->avbps >> e->ewma_log); e->rate_est->bps = (e->avbps+0xF)>>5; rate = (npackets - e->last_packets)<<(12 - idx); e->last_packets = npackets; - e->avpps += ((long)rate - (long)e->avpps) >> e->ewma_log; + e->avpps += (rate >> e->ewma_log) - (e->avpps >> e->ewma_log); e->rate_est->pps = (e->avpps+0x1FF)>>10; skip: read_unlock(&est_lock);