X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Fopenflow%2Fopenflow-1.2.h;h=58093a84b6beaacb0e3d2e489f8af65272ea9e93;hb=41ca9a1e89c861823e6b73d3a207fdfbd95423e7;hp=aaf52a1487fb709ec2b8272272314da262f1c28c;hpb=ce00d4982293323384f32e5a35eb3441f350d20a;p=openvswitch

diff --git a/include/openflow/openflow-1.2.h b/include/openflow/openflow-1.2.h
index aaf52a14..58093a84 100644
--- a/include/openflow/openflow-1.2.h
+++ b/include/openflow/openflow-1.2.h
@@ -125,6 +125,8 @@ enum oxm12_ofb_match_fields {
 #define OXM_HEADER_W(FIELD, LENGTH) \
     NXM_HEADER_W(OFPXMC12_OPENFLOW_BASIC, FIELD, LENGTH)
 
+#define IS_OXM_HEADER(header) (NXM_VENDOR(header) == OFPXMC12_OPENFLOW_BASIC)
+
 #define OXM_OF_IN_PORT        OXM_HEADER   (OFPXMT12_OFB_IN_PORT, 4)
 #define OXM_OF_IN_PHY_PORT    OXM_HEADER   (OFPXMT12_OFB_IN_PHY_PORT, 4)
 #define OXM_OF_METADATA       OXM_HEADER   (OFPXMT12_OFB_METADATA, 8)
@@ -196,7 +198,7 @@ enum ofp12_action_type {
                                   to outermost */
     OFPAT12_COPY_TTL_IN,       /* Copy TTL "inwards" -- from outermost to
                                   next-to-outermost */
-    OFPAT12_SET_MPLS_TTL,      /* MPLS TTL */
+    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 */