From: Ethan Jackson <ethan@nicira.com>
Date: Fri, 18 Nov 2011 01:11:04 +0000 (-0800)
Subject: ofproto-dpif: Consistently set NetFlow Output Interface.
X-Git-Tag: v1.4.0~119
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=4b23aebfca469739f6c4b03ad1c7c7bab9e902ba;p=sliver-openvswitch.git

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 05cbcc825..0aae004b4 100644
--- 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