--- openflow-2011-09-16-2.h	2015-07-23 09:54:16.688479343 -0700
+++ openflow-2011-09-19-5.h	2015-07-23 09:54:16.692479343 -0700
@@ -1207,7 +1207,8 @@
     OFPBAC_TOO_MANY,           /* Can't handle this many actions. */
     OFPBAC_BAD_QUEUE,          /* Problem validating output queue. */
     OFPBAC_BAD_OUT_GROUP,      /* Invalid group id in forward action. */
-    OFPBAC_MATCH_INCONSISTENT, /* Action can't apply for this match. */
+    OFPBAC_MATCH_INCONSISTENT, /* Action can't apply for this match,
+                                  or Set-Field missing prerequisite. */
     OFPBAC_UNSUPPORTED_ORDER,  /* Action order is unsupported for the action
 				  list in an Apply-Actions instruction */
     OFPBAC_BAD_TAG,            /* Actions uses an unsupported
@@ -1514,6 +1515,10 @@
                                 fields the table can match on. */
     uint64_t wildcards;      /* Bitmap of (1 << OFPXMT_*) wildcards that are
                                 supported by the table. */
+    uint32_t write_actions;  /* Bitmap of OFPAT_* that are supported
+                                by the table with OFPIT_WRITE_ACTIONS. */
+    uint32_t apply_actions;  /* Bitmap of OFPAT_* that are supported
+                                by the table with OFPIT_APPLY_ACTIONS. */
     uint64_t write_setfields;/* Bitmap of (1 << OFPXMT_*) header fields that
                                 can be set with OFPIT_WRITE_ACTIONS. */
     uint64_t apply_setfields;/* Bitmap of (1 << OFPXMT_*) header fields that
@@ -1521,10 +1526,6 @@
     uint64_t metadata_match; /* Bits of metadata table can match. */
     uint64_t metadata_write; /* Bits of metadata table can write. */
     uint32_t instructions;   /* Bitmap of OFPIT_* values supported. */
-    uint32_t write_actions;  /* Bitmap of OFPAT_* that are supported
-                                by the table with OFPIT_WRITE_ACTIONS. */
-    uint32_t apply_actions;  /* Bitmap of OFPAT_* that are supported
-                                by the table with OFPIT_APPLY_ACTIONS. */
     uint32_t config;         /* Bitmap of OFPTC_* values */
     uint32_t max_entries;    /* Max number of entries supported. */
     uint32_t active_count;   /* Number of active entries. */