From: Andy Zhou <azhou@nicira.com>
Date: Wed, 16 Apr 2014 15:04:23 +0000 (-0700)
Subject: ofproto-dpif: xlate should not attribute stats to bond entry when using recirc
X-Git-Tag: sliver-openvswitch-2.2.90-1~3^2~126
X-Git-Url: http://git.onelab.eu/?p=sliver-openvswitch.git;a=commitdiff_plain;h=eb7282ddfa7d9fe9ab89c7543456978e671f4335

ofproto-dpif: xlate should not attribute stats to bond entry when using recirc

When recirculation is used to implement bond, the bond entry stats are
collected from the hidden post recirculation rules. This bug causes
double counting of stats to some strenuous bond entries.

Signed-off-by: Andy Zhou <azhou@nicira.com>
Acked-by: Jarno Rajahalme <jrajahalme@nicira.com>
---

diff --git a/ofproto/ofproto-dpif-xlate.c b/ofproto/ofproto-dpif-xlate.c
index 91ce7b71d..cc4be6d90 100644
--- a/ofproto/ofproto-dpif-xlate.c
+++ b/ofproto/ofproto-dpif-xlate.c
@@ -1169,7 +1169,7 @@ output_normal(struct xlate_ctx *ctx, const struct xbundle *out_xbundle,
             return;
         }
 
-        if (ctx->xin->resubmit_stats) {
+        if (ctx->xin->resubmit_stats && !ctx->xout->use_recirc) {
             bond_account(out_xbundle->bond, &ctx->xin->flow, vid,
                          ctx->xin->resubmit_stats->n_bytes);
         }