X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Fopenflow%2Fopenflow-1.0.h;h=890676cb30f29eaac6d1826cfee081b0e573b733;hb=ae0e7009320a4aceff41c53e0ce004cfc18b5f27;hp=140ae3b80ab3eddac174debbca627453cdfb613c;hpb=50d25de67fe5b68fb2492e014a6f30a1f48bfdd3;p=openvswitch

diff --git a/include/openflow/openflow-1.0.h b/include/openflow/openflow-1.0.h
index 140ae3b8..890676cb 100644
--- a/include/openflow/openflow-1.0.h
+++ b/include/openflow/openflow-1.0.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -178,6 +178,25 @@ struct ofp10_port_mod {
 };
 OFP_ASSERT(sizeof(struct ofp10_port_mod) == 32);
 
+/* Query for port queue configuration. */
+struct ofp10_queue_get_config_request {
+    struct ofp_header header;
+    ovs_be16 port;          /* Port to be queried. Should refer
+                               to a valid physical port (i.e. < OFPP_MAX) */
+    uint8_t pad[2];
+    /* 32-bit alignment. */
+};
+OFP_ASSERT(sizeof(struct ofp10_queue_get_config_request) == 12);
+
+/* Queue configuration for a given port. */
+struct ofp10_queue_get_config_reply {
+    struct ofp_header header;
+    ovs_be16 port;
+    uint8_t pad[6];
+    /* struct ofp10_packet_queue queues[0]; List of configured queues. */
+};
+OFP_ASSERT(sizeof(struct ofp10_queue_get_config_reply) == 16);
+
 /* Packet received on port (datapath -> controller). */
 struct ofp_packet_in {
     struct ofp_header header;
@@ -495,42 +514,6 @@ struct ofp_error_msg {
 };
 OFP_ASSERT(sizeof(struct ofp_error_msg) == 12);
 
-enum ofp_stats_types {
-    /* Description of this OpenFlow switch.
-     * The request is struct ofp_stats_msg.
-     * The reply is struct ofp_desc_stats. */
-    OFPST_DESC,
-
-    /* Individual flow statistics.
-     * The request is struct ofp_flow_stats_request.
-     * The reply body is an array of struct ofp_flow_stats. */
-    OFPST_FLOW,
-
-    /* Aggregate flow statistics.
-     * The request is struct ofp_flow_stats_request.
-     * The reply is struct ofp_aggregate_stats_reply. */
-    OFPST_AGGREGATE,
-
-    /* Flow table statistics.
-     * The request is struct ofp_stats_msg.
-     * The reply body is an array of struct ofp_table_stats. */
-    OFPST_TABLE,
-
-    /* Physical port statistics.
-     * The request is struct ofp_port_stats_request.
-     * The reply body is an array of struct ofp_port_stats. */
-    OFPST_PORT,
-
-    /* Queue statistics for a port.
-     * The request body is struct ofp_queue_stats_request.
-     * The reply body is an array of struct ofp_queue_stats. */
-    OFPST_QUEUE,
-
-    /* Vendor extension.
-     * The request and reply begin with "struct ofp_vendor_stats". */
-    OFPST_VENDOR = 0xffff
-};
-
 /* Statistics request or reply message. */
 struct ofp_stats_msg {
     struct ofp_header header;