From: Justin Pettit <jpettit@nicira.com>
Date: Wed, 12 Jun 2013 05:47:12 +0000 (-0700)
Subject: ofproto-dpif: Use proper flow when using facets.
X-Git-Tag: sliver-openvswitch-1.10.90-3~6^2~127
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=67a2a536abc5af4ab350e1160c12d553f7a071f9;p=sliver-openvswitch.git

ofproto-dpif: Use proper flow when using facets.

The handle_flow_miss_with_facet() function used the facet's flow
information instead of the missed flow.  This corrects that.

Signed-off-by: Justin Pettit <jpettit@nicira.com>
Acked-by: Ethan Jackson <ethan@nicira.com>
---

diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c
index 74a6ead10..c0f6df07e 100644
--- a/ofproto/ofproto-dpif.c
+++ b/ofproto/ofproto-dpif.c
@@ -3788,7 +3788,7 @@ handle_flow_miss_with_facet(struct flow_miss *miss, struct facet *facet,
         if (want_path != SF_FAST_PATH) {
             struct xlate_in xin;
 
-            xlate_in_init(&xin, ofproto, &facet->flow, facet->rule, 0, packet);
+            xlate_in_init(&xin, ofproto, &miss->flow, facet->rule, 0, packet);
             xlate_actions_for_side_effects(&xin);
         }
 
@@ -3817,7 +3817,7 @@ handle_flow_miss_with_facet(struct flow_miss *miss, struct facet *facet,
             put->actions = facet->xout.odp_actions.data;
             put->actions_len = facet->xout.odp_actions.size;
         } else {
-            compose_slow_path(ofproto, &facet->flow, facet->xout.slow,
+            compose_slow_path(ofproto, &miss->flow, facet->xout.slow,
                               op->slow_stub, sizeof op->slow_stub,
                               &put->actions, &put->actions_len);
         }