From 9167fc1ae524e6ef33e706daf38e77af9188d8d2 Mon Sep 17 00:00:00 2001 From: Jarno Rajahalme Date: Fri, 29 Jan 2016 17:28:08 -0800 Subject: [PATCH] ofproto-dpif-xlate: Remove obsolete special case. Bond recirculation used to insert a special rule that jumped from the internal table to table 0 using GOTO_TABLE. Since the introduction of the ofproto-dpif-rid this has not been necessary any more, so we can remove the special case that allowed GOTO_TABLE to go backwards in that case. Signed-off-by: Jarno Rajahalme --- ofproto/ofproto-dpif-xlate.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/ofproto/ofproto-dpif-xlate.c b/ofproto/ofproto-dpif-xlate.c index 6e928da62..1edc1b0e8 100644 --- a/ofproto/ofproto-dpif-xlate.c +++ b/ofproto/ofproto-dpif-xlate.c @@ -4787,12 +4787,8 @@ do_xlate_actions(const struct ofpact *ofpacts, size_t ofpacts_len, case OFPACT_GOTO_TABLE: { struct ofpact_goto_table *ogt = ofpact_get_GOTO_TABLE(a); - /* Allow ctx->table_id == TBL_INTERNAL, which will be greater - * than ogt->table_id. This is to allow goto_table actions that - * triggered recirculation: ctx->table_id will be TBL_INTERNAL - * after recirculation. */ - ovs_assert(ctx->table_id == TBL_INTERNAL - || ctx->table_id < ogt->table_id); + ovs_assert(ctx->table_id < ogt->table_id); + xlate_table_action(ctx, ctx->xin->flow.in_port.ofp_port, ogt->table_id, true, true); break; -- 2.20.1