X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=utilities%2Fovs-openflowd.c;h=45333fd14b07763939ae5a73111b577190920be9;hb=c424adb3ac3460818256181a073b09e92cdc562a;hp=d3b7ff560c9eb243bb8a3a31e9da142e9a207d10;hpb=7d674866d2c95d9027fc2e64d1acc2044e2c004a;p=openvswitch

diff --git a/utilities/ovs-openflowd.c b/utilities/ovs-openflowd.c
index d3b7ff56..45333fd1 100644
--- a/utilities/ovs-openflowd.c
+++ b/utilities/ovs-openflowd.c
@@ -74,9 +74,6 @@ struct ofsettings {
     /* Failure behavior. */
     int max_idle;             /* Idle time for flows in fail-open mode. */
 
-    /* Spanning tree protocol. */
-    bool enable_stp;
-
     /* NetFlow. */
     struct svec netflow;        /* NetFlow targets. */
 };
@@ -150,10 +147,6 @@ main(int argc, char *argv[])
     if (error) {
         ovs_fatal(error, "failed to configure NetFlow collectors");
     }
-    error = ofproto_set_stp(ofproto, s.enable_stp);
-    if (error) {
-        ovs_fatal(error, "failed to configure STP");
-    }
     ofproto_set_controllers(ofproto, s.controllers, s.n_controllers);
     ofproto_set_fail_mode(ofproto, s.fail_mode);
 
@@ -203,8 +196,6 @@ parse_options(int argc, char *argv[], struct ofsettings *s)
         OPT_RATE_LIMIT,
         OPT_BURST_LIMIT,
         OPT_BOOTSTRAP_CA_CERT,
-        OPT_STP,
-        OPT_NO_STP,
         OPT_OUT_OF_BAND,
         OPT_IN_BAND,
         OPT_NETFLOW,
@@ -231,8 +222,6 @@ parse_options(int argc, char *argv[], struct ofsettings *s)
         {"snoop",      required_argument, 0, OPT_SNOOP},
         {"rate-limit",  optional_argument, 0, OPT_RATE_LIMIT},
         {"burst-limit", required_argument, 0, OPT_BURST_LIMIT},
-        {"stp",         no_argument, 0, OPT_STP},
-        {"no-stp",      no_argument, 0, OPT_NO_STP},
         {"out-of-band", no_argument, 0, OPT_OUT_OF_BAND},
         {"in-band",     no_argument, 0, OPT_IN_BAND},
         {"netflow",     required_argument, 0, OPT_NETFLOW},
@@ -273,7 +262,6 @@ parse_options(int argc, char *argv[], struct ofsettings *s)
     svec_init(&controllers);
     svec_init(&s->snoops);
     s->max_idle = 0;
-    s->enable_stp = false;
     svec_init(&s->netflow);
     svec_init(&s->ports);
     for (;;) {
@@ -378,14 +366,6 @@ parse_options(int argc, char *argv[], struct ofsettings *s)
             }
             break;
 
-        case OPT_STP:
-            s->enable_stp = true;
-            break;
-
-        case OPT_NO_STP:
-            s->enable_stp = false;
-            break;
-
         case OPT_OUT_OF_BAND:
             controller_opts.band = OFPROTO_OUT_OF_BAND;
             break;
@@ -477,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 "