OpenFlow 1.1 and 1.2 action numbering is compatible, in that no OpenFlow 1.2 action uses an OpenFlow 1.1 action number in a different way from OpenFlow 1.1. So it's confusing and unnecessary to have separate definitions for these numbers.
Signed-off-by: Ben Pfaff <[email protected]> --- include/openflow/openflow-1.2.h | 18 +----------------- ofproto/ofproto.c | 4 ++-- 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/include/openflow/openflow-1.2.h b/include/openflow/openflow-1.2.h index f6befdb..1c3f017 100644 --- a/include/openflow/openflow-1.2.h +++ b/include/openflow/openflow-1.2.h @@ -190,23 +190,7 @@ struct ofp12_oxm_experimenter_header { OFP_ASSERT(sizeof(struct ofp12_oxm_experimenter_header) == 8); enum ofp12_action_type { - OFPAT12_OUTPUT = 0, /* Output to switch port. */ - OFPAT12_COPY_TTL_OUT = 11, /* Copy TTL "outwards" -- from next-to-outermost - to outermost */ - OFPAT12_COPY_TTL_IN, /* Copy TTL "inwards" -- from outermost to - next-to-outermost */ - OFPAT12_SET_MPLS_TTL = 15, /* MPLS TTL */ - OFPAT12_DEC_MPLS_TTL, /* Decrement MPLS TTL */ - OFPAT12_PUSH_VLAN, /* Push a new VLAN tag */ - OFPAT12_POP_VLAN, /* Pop the outer VLAN tag */ - OFPAT12_PUSH_MPLS, /* Push a new MPLS tag */ - OFPAT12_POP_MPLS, /* Pop the outer MPLS tag */ - OFPAT12_SET_QUEUE, /* Set queue id when outputting to a port */ - OFPAT12_GROUP, /* Apply group. */ - OFPAT12_SET_NW_TTL, /* IP TTL. */ - OFPAT12_DEC_NW_TTL, /* Decrement IP TTL. */ - OFPAT12_SET_FIELD, /* Set a header field using OXM TLV format. */ - OFPAT12_EXPERIMENTER = 0xffff + OFPAT12_SET_FIELD = 25, /* Set a header field using OXM TLV format. */ }; enum ofp12_controller_max_len { diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c index e3b24c1..b87b6e7 100644 --- a/ofproto/ofproto.c +++ b/ofproto/ofproto.c @@ -2258,8 +2258,8 @@ handle_table_stats_request(struct ofconn *ofconn, sprintf(ots[i].name, "table%zu", i); ots[i].match = htonll(OFPXMT12_MASK); ots[i].wildcards = htonll(OFPXMT12_MASK); - ots[i].write_actions = htonl(OFPAT12_OUTPUT); - ots[i].apply_actions = htonl(OFPAT12_OUTPUT); + ots[i].write_actions = htonl(OFPAT11_OUTPUT); + ots[i].apply_actions = htonl(OFPAT11_OUTPUT); ots[i].write_setfields = htonll(OFPXMT12_MASK); ots[i].apply_setfields = htonll(OFPXMT12_MASK); ots[i].metadata_match = htonll(UINT64_MAX); -- 1.7.2.5 _______________________________________________ dev mailing list [email protected] http://openvswitch.org/mailman/listinfo/dev
