X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=utilities%2Fovs-openflowd.c;h=75413f388699f2d3ea9605946cb96d5f1a6e0a74;hb=cd10ed7fb4fb5b1e3ed8e3fae1fd115c7ae96e77;hp=8cb50e4b479d9cfa15e8b806fd9c000cb0d484d4;hpb=ba186119ca5f787486189c041d76d63dee629dc1;p=openvswitch diff --git a/utilities/ovs-openflowd.c b/utilities/ovs-openflowd.c index 8cb50e4b..75413f38 100644 --- a/utilities/ovs-openflowd.c +++ b/utilities/ovs-openflowd.c @@ -46,7 +46,7 @@ #include "vconn.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(openflowd) +VLOG_DEFINE_THIS_MODULE(openflowd); /* Settings that may be configured by the user. */ struct ofsettings { @@ -457,19 +457,13 @@ parse_options(int argc, char *argv[], struct ofsettings *s) /* Set up controllers. */ s->n_controllers = controllers.n; s->controllers = xmalloc(s->n_controllers * sizeof *s->controllers); - if (argc > 1) { - size_t i; - - for (i = 0; i < s->n_controllers; i++) { - s->controllers[i] = controller_opts; - s->controllers[i].target = controllers.names[i]; - } + for (i = 0; i < s->n_controllers; i++) { + s->controllers[i] = controller_opts; + s->controllers[i].target = controllers.names[i]; } /* Sanity check. */ if (controller_opts.band == OFPROTO_OUT_OF_BAND) { - size_t i; - for (i = 0; i < s->n_controllers; i++) { if (!strcmp(s->controllers[i].target, "discover")) { ovs_fatal(0, "Cannot perform discovery with out-of-band "