--- openflow-2014-09-10.h	2015-07-23 09:54:17.784479388 -0700
+++ openflow-2012-09-26.h	2015-07-23 09:54:17.788479388 -0700
@@ -712,9 +712,10 @@
     OFPXMT_OFB_IPV6_EXTHDR    = 39, /* IPv6 Extension Header pseudo-field */
     OFPXMT_OFB_PBB_UCA        = 41, /* PBB UCA header field. */
     OFPXMT_OFB_TCP_FLAGS      = 42, /* TCP flags. */
+    OFPXMT_OFB_ACTSET_OUTPUT  = 43, /* Output port from action set metadata. */
 };
 
-#define OFPXMT_OFB_ALL    ((UINT64_C(1) << 42) - 1)
+#define OFPXMT_OFB_ALL    ((UINT64_C(1) << 44) - 1)
 
 /* OpenFlow port on which the packet was received.
  * May be a physical port, a logical port, or the reserved port OFPP_LOCAL
@@ -1150,6 +1151,7 @@
     OFPIEH_UNSEQ  = 1 << 8,     /* Unexpected sequencing encountered. */
 };
 
+
 /* IEEE 802.1ah UCA.
  *
  * For a packet with a PBB header, this is the UCA (Use Customer Address)
@@ -1164,6 +1166,20 @@
  * Masking: Not maskable. */
 #define OXM_OF_PBB_UCA    OXM_HEADER  (0x8000, OFPXMT_OFB_PBB_UCA, 1)
 
+/* Output port from action set Metadata.
+ *
+ * Metadata representing the forwarding decision in the action set.
+ * If the action set contains an output action, this field equals
+ * the output port.
+ * Else, the field equals its initial value, OFPP_TABLE.
+ *
+ * Prereqs: None.
+ *
+ * Format: 32-bit integer in network byte order.
+ *
+ * Masking: Not maskable. */
+#define OXM_OF_ACTSET_OUTPUT OXM_HEADER  (0x8000, OFPXMT_OFB_ACTSET_OUTPUT, 4)
+
 /* Header for OXM experimenter match fields.
  * The experimenter class should not use OXM_HEADER() macros for defining
  * fields due to this extra header. */