From 57ca714f7559feb399470f2cc477473c7825e403 Mon Sep 17 00:00:00 2001 From: Jarno Rajahalme Date: Fri, 31 May 2013 14:35:11 +0300 Subject: [PATCH] ofproto-dpif: Check for MPLS depth at the flow. The earlier check on base_flow.mpls_depth seemed wrong, as multiple MPLS push actions would have resulted in the flow.mpls_depth being set to 1 each time. Signed-off-by: Jarno Rajahalme Signed-off-by: Ben Pfaff --- ofproto/ofproto-dpif-xlate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ofproto/ofproto-dpif-xlate.c b/ofproto/ofproto-dpif-xlate.c index e4b1fd3b3..968215852 100644 --- a/ofproto/ofproto-dpif-xlate.c +++ b/ofproto/ofproto-dpif-xlate.c @@ -1116,7 +1116,7 @@ execute_mpls_push_action(struct xlate_ctx *ctx, ovs_be16 eth_type) memset(&ctx->xout->wc.masks.mpls_depth, 0xff, sizeof ctx->xout->wc.masks.mpls_depth); - if (ctx->base_flow.mpls_depth) { + if (ctx->xin->flow.mpls_depth) { ctx->xin->flow.mpls_lse &= ~htonl(MPLS_BOS_MASK); ctx->xin->flow.mpls_depth++; } else { -- 2.43.0