--- openflow-2012-03-23.h	2015-07-23 09:54:17.140479362 -0700
+++ openflow-2012-03-27.h	2015-07-23 09:54:17.144479362 -0700
@@ -909,12 +909,18 @@
     OFPAT_EXPERIMENTER = 0xffff
 };
 
-/* Generic ofp_action structure */
-struct ofp_action {
-    uint16_t type;                /* Action type */
-    uint16_t len;                 /* Length of this struct in bytes. */
+/* Action header that is common to all actions.  The length includes the
+ * header and any padding used to make the action 64-bit aligned.
+ * NB: The length of an action *must* always be a multiple of eight. */
+struct ofp_action_header {
+    uint16_t type;                  /* One of OFPAT_*. */
+    uint16_t len;                   /* Length of action, including this
+                                       header.  This is the length of action,
+                                       including any padding to make it
+                                       64-bit aligned. */
+    uint8_t pad[4];
 };
-OFP_ASSERT(sizeof(struct ofp_action) == 4);
+OFP_ASSERT(sizeof(struct ofp_action_header) == 8);
 
 enum ofp_controller_max_len {
 	OFPCML_MAX       = 0xffe5, /* maximum max_len value which can be used
@@ -1007,19 +1013,6 @@
 };
 OFP_ASSERT(sizeof(struct ofp_action_experimenter_header) == 8);
 
-/* Action header that is common to all actions.  The length includes the
- * header and any padding used to make the action 64-bit aligned.
- * NB: The length of an action *must* always be a multiple of eight. */
-struct ofp_action_header {
-    uint16_t type;                  /* One of OFPAT_*. */
-    uint16_t len;                   /* Length of action, including this
-                                       header.  This is the length of action,
-                                       including any padding to make it
-                                       64-bit aligned. */
-    uint8_t pad[4];
-};
-OFP_ASSERT(sizeof(struct ofp_action_header) == 8);
-
 /* ## ---------------------- ## */
 /* ## OpenFlow Instructions. ## */
 /* ## ---------------------- ## */
@@ -1901,7 +1894,7 @@
      *   - Exactly (length - 4) bytes containing the action_ids, then
      *   - Exactly (length + 7)/8*8 - (length) (between 0 and 7)
      *     bytes of all-zero bytes */
-    struct ofp_action        action_ids[0];      /* List of actions */
+    struct ofp_action_header  action_ids[0];      /* List of actions */
 };
 OFP_ASSERT(sizeof(struct ofp_table_feature_prop_actions) == 4);