From: Ethan Jackson <ethan@nicira.com>
Date: Thu, 24 Feb 2011 20:38:30 +0000 (-0800)
Subject: ofproto: Reset facet's rs_used at rule changes.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e1b32141734bf944c63de8ab15538135bf3f8fd;p=openvswitch

ofproto: Reset facet's rs_used at rule changes.

When a facet changes rules it's 'used' timer is set to the new
rule's created time.  This is possibly before the time stored in
'rs_used' which could cause an assertion failure in
facet_push_stats().

Bug #4732.
---

diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c
index 8af18145..456dcb19 100644
--- a/ofproto/ofproto.c
+++ b/ofproto/ofproto.c
@@ -2566,6 +2566,7 @@ facet_revalidate(struct ofproto *ofproto, struct facet *facet)
         list_push_back(&new_rule->facets, &facet->list_node);
         facet->rule = new_rule;
         facet->used = new_rule->created;
+        facet->rs_used = facet->used;
     }
 
     ofpbuf_delete(odp_actions);