From: Jesse Gross <jesse@nicira.com>
Date: Wed, 28 Oct 2009 23:05:57 +0000 (-0700)
Subject: ofproto: Only zero stats for non exact-match sub-rules.
X-Git-Tag: v0.90.7~25
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;ds=sidebyside;h=0c0afbecaace0509d7b2e5b7dee4b4eac7b31e19;p=sliver-openvswitch.git

ofproto: Only zero stats for non exact-match sub-rules.

We zero the stats on sub-rules after they expire to prevent them
from being counted twice in their super-rule if they are reinstalled.
However, for exact-match sub-rules this means that the OpenFlow stats
are always zero.  This changes that to only zero the stats for
non exact match rules.

Bug #1911
---

diff --git a/secchan/ofproto.c b/secchan/ofproto.c
index 7fb0c646f..4266cbf71 100644
--- a/secchan/ofproto.c
+++ b/secchan/ofproto.c
@@ -1731,15 +1731,15 @@ rule_post_uninstall(struct ofproto *ofproto, struct rule *rule)
         if (rule->packet_count) {
             super->ip_tos = rule->ip_tos;
         }
-    }
 
-    /* Reset counters to prevent double counting if the rule ever gets
-     * reinstalled. */
-    rule->packet_count = 0;
-    rule->byte_count = 0;
-    rule->accounted_bytes = 0;
-    rule->tcp_flags = 0;
-    rule->ip_tos = 0;
+        /* Reset counters to prevent double counting if the rule ever gets
+         * reinstalled. */
+        rule->packet_count = 0;
+        rule->byte_count = 0;
+        rule->accounted_bytes = 0;
+        rule->tcp_flags = 0;
+        rule->ip_tos = 0;
+    }
 }
 
 static void