--- openflow-2012-03-20-3.h	2015-07-23 09:54:17.124479361 -0700
+++ openflow-2012-03-21.h	2015-07-23 09:54:17.132479361 -0700
@@ -1866,7 +1866,8 @@
 
 /* Instructions property */
 struct ofp_table_feature_prop_instructions {
-    uint16_t         type;    /* One of OFPTFPT_*. */
+    uint16_t         type;    /* One of OFPTFPT_INSTRUCTIONS,
+                                 OFPTFPT_INSTRUCTIONS_MISS. */
     uint16_t         length;  /* Length in bytes of this property. */
     /* Followed by:
      *   - Exactly (length - 4) bytes containing the instruction ids, then
@@ -1878,7 +1879,8 @@
 
 /* Next Tables property */
 struct ofp_table_feature_prop_next_tables {
-    uint16_t         type;    /* One of OFPTFPT_*. */
+    uint16_t         type;    /* One of OFPTFPT_NEXT_TABLES,
+                                 OFPTFPT_NEXT_TABLES_MISS. */
     uint16_t         length;  /* Length in bytes of this property. */
     /* Followed by:
      *   - Exactly (length - 4) bytes containing the table_ids, then
@@ -1890,7 +1892,10 @@
 
 /* Actions property */
 struct ofp_table_feature_prop_actions {
-    uint16_t         type;    /* One of OFPTFPT_*. */
+    uint16_t         type;    /* One of OFPTFPT_WRITE_ACTIONS,
+                                 OFPTFPT_WRITE_ACTIONS_MISS,
+                                 OFPTFPT_APPLY_ACTIONS,
+                                 OFPTFPT_APPLY_ACTIONS_MISS. */
     uint16_t         length;  /* Length in bytes of this property. */
     /* Followed by:
      *   - Exactly (length - 4) bytes containing the action_ids, then
@@ -1902,7 +1907,12 @@
 
 /* Match, Wildcard or Set-Field property */
 struct ofp_table_feature_prop_oxm {
-    uint16_t         type;    /* One of OFPTFPT_*. */
+    uint16_t         type;    /* One of OFPTFPT_MATCH,
+                                 OFPTFPT_WILDCARDS,
+                                 OFPTFPT_WRITE_SETFIELD,
+                                 OFPTFPT_WRITE_SETFIELD_MISS,
+                                 OFPTFPT_APPLY_SETFIELD,
+                                 OFPTFPT_APPLY_SETFIELD_MISS. */
     uint16_t         length;  /* Length in bytes of this property. */
     /* Followed by:
      *   - Exactly (length - 4) bytes containing the oxm_ids, then
@@ -1914,7 +1924,8 @@
 
 /* Experimenter table feature property */
 struct ofp_table_feature_prop_experimenter {
-    uint16_t         type;    /* One of OFPTFPT_*. */
+    uint16_t         type;    /* One of OFPTFPT_EXPERIMENTER,
+                                 OFPTFPT_EXPERIMENTER_MISS. */
     uint16_t         length;  /* Length in bytes of this property. */
     uint32_t         experimenter;  /* Experimenter ID which takes the same
                                        form as in struct