Looks good, Ethan
On Tue, Feb 21, 2012 at 09:30, Ben Pfaff <[email protected]> wrote: > 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 <[email protected]> > --- > ofproto/ofproto-dpif.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c > index 28f0434..cc36dce 100644 > --- a/ofproto/ofproto-dpif.c > +++ b/ofproto/ofproto-dpif.c > @@ -3092,7 +3092,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 { > -- > 1.7.2.5 > > _______________________________________________ > dev mailing list > [email protected] > http://openvswitch.org/mailman/listinfo/dev _______________________________________________ dev mailing list [email protected] http://openvswitch.org/mailman/listinfo/dev
