From 2f2eb46c3f83de7e825ea4549fa90843b9066888 Mon Sep 17 00:00:00 2001 From: Jarno Rajahalme Date: Thu, 22 Nov 2012 17:25:56 +0200 Subject: [PATCH] Add OF1.3 TUNNEL_ID support. Signed-off-by: Jarno Rajahalme Signed-off-by: Ben Pfaff --- lib/meta-flow.c | 2 +- lib/nx-match.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/meta-flow.c b/lib/meta-flow.c index 720c917c0..749898fce 100644 --- a/lib/meta-flow.c +++ b/lib/meta-flow.c @@ -54,7 +54,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { MFP_NONE, true, NXM_NX_TUN_ID, "NXM_NX_TUN_ID", - NXM_NX_TUN_ID, "NXM_NX_TUN_ID", + OXM_OF_TUNNEL_ID, "OXM_OF_TUNNEL_ID", }, { MFF_TUN_SRC, "tun_src", NULL, MF_FIELD_SIZES(be32), diff --git a/lib/nx-match.c b/lib/nx-match.c index a3a8bc389..05f1ce99f 100644 --- a/lib/nx-match.c +++ b/lib/nx-match.c @@ -644,8 +644,8 @@ nx_put_raw(struct ofpbuf *b, bool oxm, const struct match *match, } /* Tunnel ID. */ - nxm_put_64m(b, NXM_NX_TUN_ID, flow->tunnel.tun_id, - match->wc.masks.tunnel.tun_id); + nxm_put_64m(b, oxm ? OXM_OF_TUNNEL_ID : NXM_NX_TUN_ID, + flow->tunnel.tun_id, match->wc.masks.tunnel.tun_id); /* Registers. */ for (i = 0; i < FLOW_N_REGS; i++) { -- 2.47.0