Signed-off-by: Jarno Rajahalme <jarno.rajahalme@nsn.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
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),
}
/* 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++) {