ovsdb-server: Avoid intermittent test failures due to lockfile log message.

[sliver-openvswitch.git] / lib / learning-switch.h

diff --git a/lib/learning-switch.h b/lib/learning-switch.h
index 2ce49e6..e503690 100644 (file)
--- a/lib/learning-switch.h
+++ b/lib/learning-switch.h
@@ -41,14 +41,17 @@ struct lswitch_config {
      * OFP_FLOW_PERMANENT: Set up permanent flows. */
     int max_idle;
 
-    /* Optionally, a chain of one or more OpenFlow messages to send to the
-     * switch at time of connection.  Presumably these will be OFPT_FLOW_MOD
-     * requests to set up the flow table. */
-    const struct ofpbuf *default_flows;
-
-    /* The OpenFlow queue used by packets and flows set up by 'sw'.  Use
-     * UINT32_MAX to avoid specifying a particular queue. */
-    uint32_t queue_id;
+    /* Optionally, a list of one or more "struct ofpbuf"s containing OpenFlow
+     * messages to send to the switch at time of connection.  Presumably these
+     * will be OFPT_FLOW_MOD requests to set up the flow table. */
+    const struct list *default_flows;
+
+    /* The OpenFlow queue to use by default.  Use UINT32_MAX to avoid
+     * specifying a particular queue. */
+    uint32_t default_queue;
+
+    /* Maps from a port name to a queue_id (cast to void *). */
+    const struct shash *port_queues;
 };
 
 struct lswitch *lswitch_create(struct rconn *, const struct lswitch_config *);