X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fopenflow%2Fopenflow-1.0.h;h=802e80de9adc988d62fe151afa69b5bb3da778b1;hb=e0edde6fee279cdbbf3c179f5f50adaf0c7c7f1e;hp=5844a96c6186b67f9f0bb4540122ecc8c72a2fa0;hpb=9e1fd49b0cf494315c82f27c651486ef82e83446;p=sliver-openvswitch.git

diff --git a/include/openflow/openflow-1.0.h b/include/openflow/openflow-1.0.h
index 5844a96c6..802e80de9 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,13 +178,24 @@ struct ofp10_port_mod {
 };
 OFP_ASSERT(sizeof(struct ofp10_port_mod) == 32);
 
-/* Why is this packet being sent to the controller? */
-enum ofp_packet_in_reason {
-    OFPR_NO_MATCH,          /* No matching flow. */
-    OFPR_ACTION,            /* Action explicitly output to controller. */
-    OFPR_INVALID_TTL        /* Packet has invalid TTL. */,
-    OFPR_N_REASONS
+/* 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 {
@@ -472,13 +483,6 @@ struct ofp_flow_mod {
 };
 OFP_ASSERT(sizeof(struct ofp_flow_mod) == 72);
 
-/* Why was this flow removed? */
-enum ofp_flow_removed_reason {
-    OFPRR_IDLE_TIMEOUT,         /* Flow idle time exceeded idle_timeout. */
-    OFPRR_HARD_TIMEOUT,         /* Time exceeded hard_timeout. */
-    OFPRR_DELETE                /* Evicted by a DELETE flow mod. */
-};
-
 /* Flow removed (datapath -> controller). */
 struct ofp_flow_removed {
     struct ofp_header header;