--- openflow-2011-10-02-3.h	2015-07-23 09:54:16.588479339 -0700
+++ openflow-2011-10-12.h	2015-07-23 09:54:16.592479339 -0700
@@ -193,10 +193,21 @@
     OFPTC_TABLE_MISS_MASK       = 3
 };
 
+/* Table numbering. Tables can use any number up to OFPT_MAX. */
+enum ofp_table {
+    /* Last usable table number. */
+    OFPTT_MAX        = 0xfe,
+
+    /* Fake tables. */
+    OFPTT_ALL        = 0xff   /* Wildcard table used for table config,
+                                 flow stats and flow deletes. */
+};
+
+
 /* Configure/Modify behavior of a flow table */
 struct ofp_table_mod {
     struct ofp_header header;
-    uint8_t table_id;       /* ID of the table, 0xFF indicates all tables */
+    uint8_t table_id;       /* ID of the table, OFPTT_ALL indicates all tables */
     uint8_t pad[3];         /* Pad to 32 bits */
     uint32_t config;        /* Bitmap of OFPTC_* flags */
 };
@@ -768,7 +779,10 @@
                                     of 0 indicates no restriction. */
 
     /* Flow actions. */
-    uint8_t table_id;             /* ID of the table to put the flow in */
+    uint8_t table_id;             /* ID of the table to put the flow in.
+                                     For OFPFC_DELETE_* commands, OFPTT_ALL
+                                     can also be used to delete matching
+                                     flows from all tables. */
     uint8_t command;              /* One of OFPFC_*. */
     uint16_t idle_timeout;        /* Idle time before discarding (seconds). */
     uint16_t hard_timeout;        /* Max time before discarding (seconds). */
@@ -1148,7 +1162,7 @@
 /* Body for ofp_stats_request of type OFPST_FLOW. */
 struct ofp_flow_stats_request {
     uint8_t table_id;         /* ID of table to read (from ofp_table_stats),
-                                 0xff for all tables. */
+                                 OFPTT_ALL for all tables. */
     uint8_t pad[3];           /* Align to 64 bits. */
     uint32_t out_port;        /* Require matching entries to include this
                                  as an output port.  A value of OFPP_ANY
@@ -1190,7 +1204,7 @@
 /* Body for ofp_stats_request of type OFPST_AGGREGATE. */
 struct ofp_aggregate_stats_request {
     uint8_t table_id;         /* ID of table to read (from ofp_table_stats)
-                                 0xff for all tables. */
+                                 OFPTT_ALL for all tables. */
     uint8_t pad[3];           /* Align to 64 bits. */
     uint32_t out_port;        /* Require matching entries to include this
                                  as an output port.  A value of OFPP_ANY