--- openflow-2014-01-03-2.h	2015-07-23 09:54:17.648479382 -0700
+++ openflow-2014-01-03-3.h	2015-07-23 09:54:17.652479383 -0700
@@ -1991,7 +1991,7 @@
     OFPMP_PORT_STATS = 4,
 
     /* Queue statistics for a port
-     * The request body is struct ofp_queue_stats_request.
+     * The request body is struct ofp_queue_multipart_request.
      * The reply body is an array of struct ofp_queue_stats */
     OFPMP_QUEUE_STATS = 5,
 
@@ -2011,12 +2011,12 @@
     OFPMP_GROUP_FEATURES = 8,
 
     /* Meter statistics.
-     * The request body is struct ofp_meter_multipart_requests.
+     * The request body is struct ofp_meter_multipart_request.
      * The reply body is an array of struct ofp_meter_stats. */
     OFPMP_METER = 9,
 
     /* Meter configuration.
-     * The request body is struct ofp_meter_multipart_requests.
+     * The request body is struct ofp_meter_multipart_request.
      * The reply body is an array of struct ofp_meter_config. */
     OFPMP_METER_CONFIG = 10,
 
@@ -2044,7 +2044,7 @@
     OFPMP_TABLE_DESC = 14,
 
     /* Queue description.
-     * The request body is struct ofp_queue_desc_request.
+     * The request body is struct ofp_queue_multipart_request.
      * The reply body is an array of struct ofp_queue_desc. */
     OFPMP_QUEUE_DESC = 15,
 
@@ -2624,12 +2624,13 @@
 };
 OFP_ASSERT(sizeof(struct ofp_queue_desc_prop_experimenter) == 12);
 
-/* Body for ofp_multipart_request of type OFPMP_QUEUE_DESC. */
-struct ofp_queue_desc_request {
+/* Body for ofp_multipart_request of types OFPMP_QUEUE_DESC and
+ * OFPMP_QUEUE_STATS. */
+struct ofp_queue_multipart_request {
     uint32_t port_no;        /* All ports if OFPP_ANY. */
     uint32_t queue_id;       /* All queues if OFPQ_ALL. */
 };
-OFP_ASSERT(sizeof(struct ofp_queue_desc_request) == 8);
+OFP_ASSERT(sizeof(struct ofp_queue_multipart_request) == 8);
 
 /* Body of reply to OFPMP_QUEUE_DESC request. */
 struct ofp_queue_desc {
@@ -2642,13 +2643,6 @@
 };
 OFP_ASSERT(sizeof(struct ofp_queue_desc) == 16);
 
-/* Body for ofp_multipart_request of type OFPMP_QUEUE_STATS. */
-struct ofp_queue_stats_request {
-    uint32_t port_no;        /* All ports if OFPP_ANY. */
-    uint32_t queue_id;       /* All queues if OFPQ_ALL. */
-};
-OFP_ASSERT(sizeof(struct ofp_queue_stats_request) == 8);
-
 enum ofp_queue_stats_prop_type {
     OFPQSPT_EXPERIMENTER  = 0xffff  /* Experimenter defined property. */
 };