--- openflow-2012-03-20.h	2015-07-23 09:54:17.104479360 -0700
+++ openflow-2012-03-19-3.h	2015-07-23 09:54:17.112479361 -0700
@@ -310,11 +310,6 @@
     /* Features. */
     uint32_t capabilities;  /* Bitmap of support "ofp_capabilities". */
     uint32_t reserved;
-
-    /* Port info.*/
-    struct ofp_port ports[0];  /* Port definitions.  The number of ports
-                                  is inferred from the length field in
-                                  the header. */
 };
 OFP_ASSERT(sizeof(struct ofp_switch_features) == 32);
 
@@ -1660,7 +1655,7 @@
     /* Port statistics.
      * The request body is struct ofp_port_stats_request.
      * The reply body is an array of struct ofp_port_stats. */
-    OFPMP_PORT = 4,
+    OFPMP_PORT_STATS = 4,
 
     /* Queue statistics for a port
      * The request body is struct ofp_queue_stats_request.
@@ -1705,6 +1700,11 @@
      * The reply body is an array of struct ofp_table_features. */
     OFPMP_TABLE_FEATURES = 12,
 
+    /* Port description.
+     * The request body is empty.
+     * The reply body is an array of struct ofp_port. */
+    OFPMP_PORT_DESC = 10,
+
     /* Experimenter extension.
      * The request and reply bodies begin with
      * struct ofp_experimenter_multipart_header.