X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=utilities%2Fovs-controller.c;h=f487d8ce02c41e0a513ec39d2c86771178cfd81d;hb=3442636d01d2a73a557952ad9140de07418c28c2;hp=d9ae98300275a9f256d64e74cdb4a91b25849f1f;hpb=bbb8dee92d639331e8bd81823638267dcc895396;p=sliver-openvswitch.git

diff --git a/utilities/ovs-controller.c b/utilities/ovs-controller.c
index d9ae98300..f487d8ce0 100644
--- a/utilities/ovs-controller.c
+++ b/utilities/ovs-controller.c
@@ -83,6 +83,7 @@ static struct simap port_queues = SIMAP_INITIALIZER(&port_queues);
 /* --with-flows: Flows to send to switch. */
 static struct ofputil_flow_mod *default_flows;
 static size_t n_default_flows;
+static enum ofputil_protocol usable_protocols;
 
 /* --unixctl: Name of unixctl socket, or null to use the default. */
 static char *unixctl_path = NULL;
@@ -216,6 +217,7 @@ new_switch(struct switch_ *sw, struct vconn *vconn)
     cfg.max_idle = set_up_flows ? max_idle : -1;
     cfg.default_flows = default_flows;
     cfg.n_default_flows = n_default_flows;
+    cfg.usable_protocols = usable_protocols;
     cfg.default_queue = default_queue;
     cfg.port_queues = &port_queues;
     cfg.mute = mute;
@@ -329,7 +331,8 @@ parse_options(int argc, char *argv[])
 
         case OPT_WITH_FLOWS:
             error = parse_ofp_flow_mod_file(optarg, OFPFC_ADD, &default_flows,
-                                            &n_default_flows);
+                                            &n_default_flows,
+                                            &usable_protocols);
             if (error) {
                 ovs_fatal(0, "%s", error);
             }