This is the 3rd patch of a series of 4 patches:
1/4: OpenFlow 1.2 bug fixes
2/4: Initial OpenFlow 1.3 support
3/4: OF13 TUNNEL_ID support (also on OF12 protocol)
4/4: NXPIF_OPENFLOW13 to allow OF13 packet_in to be used over OF12 (adds
support for the matching flow cookie)
OF1.3 TUNNEL_ID support.
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 720c917..749898f 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 837db8d..4ed3273 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++) {
_______________________________________________
dev mailing list
[email protected]
http://openvswitch.org/mailman/listinfo/dev
