X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=vswitchd%2Fbridge.c;h=9fb257954227585a84552c7e1a82ce8d767ed3eb;hb=195c8086244e33ec42fd9fc8354eaedfd849bbba;hp=6f8ca25e203edf54dcb75df59ff90c4ea17c7552;hpb=21dcb94fd5fbfda3b281cfcf124ab57802d77c23;p=openvswitch

diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c
index 6f8ca25e..9fb25795 100644
--- a/vswitchd/bridge.c
+++ b/vswitchd/bridge.c
@@ -1956,8 +1956,6 @@ bridge_ofproto_controller_for_mgmt(const struct bridge *br,
     oc->max_backoff = 0;
     oc->probe_interval = 60;
     oc->band = OFPROTO_OUT_OF_BAND;
-    oc->accept_re = NULL;
-    oc->update_resolv_conf = false;
     oc->rate_limit = 0;
     oc->burst_limit = 0;
 }
@@ -1972,8 +1970,6 @@ bridge_ofproto_controller_from_ovsrec(const struct ovsrec_controller *c,
     oc->probe_interval = c->inactivity_probe ? *c->inactivity_probe / 1000 : 5;
     oc->band = (!c->connection_mode || !strcmp(c->connection_mode, "in-band")
                 ? OFPROTO_IN_BAND : OFPROTO_OUT_OF_BAND);
-    oc->accept_re = c->discover_accept_regex;
-    oc->update_resolv_conf = c->discover_update_resolv_conf;
     oc->rate_limit = c->controller_rate_limit ? *c->controller_rate_limit : 0;
     oc->burst_limit = (c->controller_burst_limit
                        ? *c->controller_burst_limit : 0);
@@ -1991,11 +1987,6 @@ bridge_configure_local_iface_netdev(struct bridge *br,
     struct iface *local_iface;
     struct in_addr ip;
 
-    /* Controller discovery does its own TCP/IP configuration later. */
-    if (strcmp(c->target, "discover")) {
-        return;
-    }
-
     /* If there's no local interface or no IP address, give up. */
     local_iface = bridge_get_local_iface(br);
     if (!local_iface || !c->local_ip || !inet_aton(c->local_ip, &ip)) {