--- openflow-2012-09-28.h	2015-07-23 09:54:17.440479374 -0700
+++ openflow-2013-03-25-2.h	2015-07-23 09:54:17.444479374 -0700
@@ -2110,18 +2110,19 @@
 };
 OFP_ASSERT(sizeof(struct ofp_table_feature_prop_instructions) == 4);
 
-/* Next Tables property */
-struct ofp_table_feature_prop_next_tables {
+/* Next Tables and Table Synchronise From properties */
+struct ofp_table_feature_prop_tables {
     uint16_t         type;    /* One of OFPTFPT_NEXT_TABLES,
-                                 OFPTFPT_NEXT_TABLES_MISS. */
+                                 OFPTFPT_NEXT_TABLES_MISS,
+                                 OFPTFPT_TABLE_SYNC_FROM. */
     uint16_t         length;  /* Length in bytes of this property. */
     /* Followed by:
      *   - Exactly (length - 4) bytes containing the table_ids, then
      *   - Exactly (length + 7)/8*8 - (length) (between 0 and 7)
      *     bytes of all-zero bytes */
-    uint8_t          next_table_ids[0];        /* List of table ids. */
+    uint8_t          table_ids[0];        /* List of table ids. */
 };
-OFP_ASSERT(sizeof(struct ofp_table_feature_prop_next_tables) == 4);
+OFP_ASSERT(sizeof(struct ofp_table_feature_prop_tables) == 4);
 
 /* Action ID */
 struct ofp_action_id {
@@ -2163,18 +2164,6 @@
 };
 OFP_ASSERT(sizeof(struct ofp_table_feature_prop_oxm) == 4);
 
-/* Table Synchronise From property */
-struct ofp_table_feature_prop_table_sync_from {
-    uint16_t         type;    /* OFPTFPT_TABLE_SYNC_FROM. */
-    uint16_t         length;  /* Length in bytes of this property. */
-    /* Followed by:
-     *   - Exactly (length - 4) bytes containing the table_ids, then
-     *   - Exactly (length + 7)/8*8 - (length) (between 0 and 7)
-     *     bytes of all-zero bytes */
-    uint8_t          table_sync_from_ids[0];
-};
-OFP_ASSERT(sizeof(struct ofp_table_feature_prop_table_sync_from) == 4);
-
 /* Experimenter table feature property */
 struct ofp_table_feature_prop_experimenter {
     uint16_t         type;    /* One of OFPTFPT_EXPERIMENTER,