netdev-vport: Don't create port when ovs-monitor-ipsec not running.

[openvswitch] / utilities / ovs-dpctl.c

diff --git a/utilities/ovs-dpctl.c b/utilities/ovs-dpctl.c
index 3167864ae27e0c97453e61f0863bf7e183547542..658f6ba106b3f6c0da6b7790edea15acc20e5037 100644 (file)
--- a/utilities/ovs-dpctl.c
+++ b/utilities/ovs-dpctl.c
@@ -241,7 +241,7 @@ do_add_if(int argc OVS_UNUSED, char *argv[])
         }
 
         shash_init(&args);
-        while ((option = strtok_r(NULL, "", &save_ptr)) != NULL) {
+        while ((option = strtok_r(NULL, ",", &save_ptr)) != NULL) {
             char *save_ptr_2 = NULL;
             char *key, *value;
 
@@ -480,7 +480,7 @@ do_dump_dps(int argc OVS_UNUSED, char *argv[] OVS_UNUSED)
 static void
 do_dump_flows(int argc OVS_UNUSED, char *argv[])
 {
-    const struct odp_flow_stats *stats;
+    const struct dpif_flow_stats *stats;
     const struct nlattr *actions;
     struct dpif_flow_dump dump;
     const struct nlattr *key;
@@ -498,7 +498,7 @@ do_dump_flows(int argc OVS_UNUSED, char *argv[])
         ds_clear(&ds);
         odp_flow_key_format(key, key_len, &ds);
         ds_put_cstr(&ds, ", ");
-        format_odp_flow_stats(&ds, stats);
+        dpif_flow_stats_format(stats, &ds);
         ds_put_cstr(&ds, ", actions:");
         format_odp_actions(&ds, actions, actions_len);
         printf("%s\n", ds_cstr(&ds));