From: Ben Pfaff <blp@nicira.com>
Date: Sun, 9 Oct 2011 22:52:21 +0000 (-0700)
Subject: ofproto-dpif: Make OFPAT_ENQUEUE to input port do nothing.
X-Git-Tag: v1.3.0~69
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=8ba855c1ab62dbc356071794f4681e9f6ba7505a;p=sliver-openvswitch.git

ofproto-dpif: Make OFPAT_ENQUEUE to input port do nothing.

This makes OFPAT_ENQUEUE consistent with OFPAT_OUTPUT for the purpose of
sending a packet back out the input port: both only do it if the port is
given as OFPP_IN_PORT.

Found by inspection.
---

diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c
index 9f73a8f88..211577b6f 100644
--- a/ofproto/ofproto-dpif.c
+++ b/ofproto/ofproto-dpif.c
@@ -3578,6 +3578,8 @@ xlate_enqueue_action(struct action_xlate_ctx *ctx,
     ofp_port = ntohs(oae->port);
     if (ofp_port == OFPP_IN_PORT) {
         ofp_port = ctx->flow.in_port;
+    } else if (ofp_port == ctx->flow.in_port) {
+        return;
     }
     odp_port = ofp_port_to_odp_port(ofp_port);