From: Ben Pfaff <blp@nicira.com>
Date: Fri, 7 Jan 2011 19:15:41 +0000 (-0800)
Subject: ofproto: Fix test for installability change when revalidating.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e4add8967bd4fe1e78566ffbd2a61e8c2db6bc43;p=openvswitch

ofproto: Fix test for installability change when revalidating.

ctx.may_set_up_flow will become the new facet->may_install, so it's that
value that we should check instead of the current facet->may_install when
deciding whether to update the datapath flow.

Reviewed by Ethan Jackson <ethan@nicira.com>.
---

diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c
index a0dca356..dd492258 100644
--- a/ofproto/ofproto.c
+++ b/ofproto/ofproto.c
@@ -2499,8 +2499,8 @@ facet_revalidate(struct ofproto *ofproto, struct facet *facet)
 
     /* If the ODP actions changed or the installability changed, then we need
      * to talk to the datapath. */
-    if (actions_changed || facet->may_install != facet->installed) {
-        if (facet->may_install) {
+    if (actions_changed || ctx.may_set_up_flow != facet->installed) {
+        if (ctx.may_set_up_flow) {
             uint32_t keybuf[ODPUTIL_FLOW_KEY_U32S];
             struct dpif_flow_stats stats;
             struct ofpbuf key;