socket-util: Add functions for sending fds over Unix domain sockets.

[openvswitch] / include / openflow / openflow-1.2.h

diff --git a/include/openflow/openflow-1.2.h b/include/openflow/openflow-1.2.h
index 7f59c07ca53b88a20301b91e1cf36d717785476e..58093a84b6beaacb0e3d2e489f8af65272ea9e93 100644 (file)
--- a/include/openflow/openflow-1.2.h
+++ b/include/openflow/openflow-1.2.h
@@ -121,9 +121,11 @@ enum oxm12_ofb_match_fields {
  */
 
 #define OXM_HEADER(FIELD, LENGTH) \
-       NXM_HEADER(OFPXMC12_OPENFLOW_BASIC, FIELD, LENGTH)
+    NXM_HEADER(OFPXMC12_OPENFLOW_BASIC, FIELD, LENGTH)
 #define OXM_HEADER_W(FIELD, LENGTH) \
-       NXM_HEADER_W(OFPXMC12_OPENFLOW_BASIC, 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)
@@ -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 */
@@ -211,11 +213,11 @@ enum ofp12_action_type {
 };
 
 enum ofp12_controller_max_len {
-       OFPCML12_MAX       = 0xffe5, /* maximum max_len value which can be used
-                                     * to request a specific byte length. */
-       OFPCML12_NO_BUFFER = 0xffff  /* indicates that no buffering should be
-                                     * applied and the whole packet is to be
-                                     * sent to the controller. */
+    OFPCML12_MAX       = 0xffe5, /* maximum max_len value which can be used
+                                  * to request a specific byte length. */
+    OFPCML12_NO_BUFFER = 0xffff  /* indicates that no buffering should be
+                                  * applied and the whole packet is to be
+                                  * sent to the controller. */
 };
 
 /* Action structure for OFPAT12_SET_FIELD. */