From 1d9d9681b5578d264a37dbf082ed5a73a2b466a0 Mon Sep 17 00:00:00 2001 From: Aaron Rosen Date: Wed, 8 Feb 2012 10:59:41 -0800 Subject: [PATCH] ofproto-dpif: Don't output to in_port even if in_port is OFPP_LOCAL. Signed-off-by: Aaron Rosen Signed-off-by: Ben Pfaff --- AUTHORS | 2 +- ofproto/ofproto-dpif.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/AUTHORS b/AUTHORS index 6713ad943..9c34dd49f 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,6 +1,7 @@ The following people, in alphabetical order, have either authored or signed off on commits in the Open vSwitch version control repository. +Aaron Rosen arosen@clemson.edu Andrew Evans aevans@nicira.com Andrew Lambeth wal@nicira.com Andy Southgate andy.southgate@citrix.com @@ -47,7 +48,6 @@ The following additional people are mentioned in commit logs as having provided helpful bug reports or suggestions. Aaron M. Ucko ucko@debian.org -Aaron Rosen arosen@clemson.edu Ahmed Bilal numan252@gmail.com Alex Yip alex@nicira.com Alexey I. Froloff raorn@altlinux.org diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c index e894fd6d3..fd2d12e83 100644 --- a/ofproto/ofproto-dpif.c +++ b/ofproto/ofproto-dpif.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, 2011 Nicira Networks. + * Copyright (c) 2009, 2010, 2011, 2012 Nicira Networks. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -2994,11 +2994,9 @@ xlate_output_action__(struct action_xlate_ctx *ctx, commit_odp_actions(ctx); nl_msg_put_u64(ctx->odp_actions, ODP_ACTION_ATTR_USERSPACE, max_len); break; - case OFPP_LOCAL: - add_output_action(ctx, OFPP_LOCAL); - break; case OFPP_NONE: break; + case OFPP_LOCAL: default: if (port != ctx->flow.in_port) { add_output_action(ctx, port); -- 2.47.0