ofproto-dpif: Consistently set NetFlow Output Interface.

Some parts of the code set the NetFlow Output Interface to the
OpenFlow port.  Other set it to the datapath port.  This patch
consistently sets it to the OpenFlow port.

diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c
index 05cbcc825a912a373de6fd0ae470bb687b3345e4..0aae004b4b56080c31dceb8ac749588636e7b52a 100644 (file)
--- a/ofproto/ofproto-dpif.c
+++ b/ofproto/ofproto-dpif.c
@@ -4006,7 +4006,7 @@ xlate_enqueue_action(struct action_xlate_ctx *ctx,
 
     /* Update NetFlow output port. */
     if (ctx->nf_output_iface == NF_OUT_DROP) {
-        ctx->nf_output_iface = odp_port;
+        ctx->nf_output_iface = ofp_port;
     } else if (ctx->nf_output_iface != NF_OUT_FLOOD) {
         ctx->nf_output_iface = NF_OUT_MULTI;
     }
@@ -4511,7 +4511,7 @@ output_normal(struct action_xlate_ctx *ctx, const struct ofbundle *out_bundle,
     commit_vlan_action(ctx, tci);
 
     compose_output_action(ctx, port->odp_port);
-    ctx->nf_output_iface = port->odp_port;
+    ctx->nf_output_iface = port->up.ofp_port;
 }
 
 static int