From: Ben Pfaff <blp@nicira.com>
Date: Thu, 2 Feb 2012 01:08:28 +0000 (-0800)
Subject: ofproto-dpif: Allow OpenFlow rules that have facets to expire.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8ea6ac3ed262114148adf44a89c68fb36d132c29;p=openvswitch

ofproto-dpif: Allow OpenFlow rules that have facets to expire.

At one time (before facets were called facets), the existence of a facet
implied that its parent rule was not idle.  This is no longer true, so
remove the check.

Signed-off-by: Ben Pfaff <blp@nicira.com>
---

diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c
index b5e316bf..c025dff4 100644
--- a/ofproto/ofproto-dpif.c
+++ b/ofproto/ofproto-dpif.c
@@ -3110,7 +3110,7 @@ rule_expire(struct rule_dpif *rule)
     if (rule->up.hard_timeout
         && now > rule->up.modified + rule->up.hard_timeout * 1000) {
         reason = OFPRR_HARD_TIMEOUT;
-    } else if (rule->up.idle_timeout && list_is_empty(&rule->facets)
+    } else if (rule->up.idle_timeout
                && now > rule->up.used + rule->up.idle_timeout * 1000) {
         reason = OFPRR_IDLE_TIMEOUT;
     } else {