From e479e41e6da957a8d4cee3aa16bb47f63ab6f477 Mon Sep 17 00:00:00 2001 From: Ethan Jackson Date: Thu, 17 Nov 2011 17:11:40 -0800 Subject: [PATCH] ofproto-dpif: Enqueue incorrectly calls add_output_action(). The add_output_action() function takes an OpenFlow port number, but the enqueue action passes it a datapath port number. --- ofproto/ofproto-dpif.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c index 0aae004b..f506bd1c 100644 --- a/ofproto/ofproto-dpif.c +++ b/ofproto/ofproto-dpif.c @@ -3977,7 +3977,7 @@ static void xlate_enqueue_action(struct action_xlate_ctx *ctx, const struct ofp_action_enqueue *oae) { - uint16_t ofp_port, odp_port; + uint16_t ofp_port; uint32_t flow_priority, priority; int error; @@ -3996,12 +3996,11 @@ xlate_enqueue_action(struct action_xlate_ctx *ctx, } else if (ofp_port == ctx->flow.in_port) { return; } - odp_port = ofp_port_to_odp_port(ofp_port); /* Add datapath actions. */ flow_priority = ctx->flow.priority; ctx->flow.priority = priority; - add_output_action(ctx, odp_port); + add_output_action(ctx, ofp_port); ctx->flow.priority = flow_priority; /* Update NetFlow output port. */ -- 2.30.2