From: Ben Pfaff <blp@nicira.com>
Date: Wed, 3 Aug 2011 21:31:54 +0000 (-0700)
Subject: connmgr: Drop 'next_in_band_update' timer.
X-Git-Tag: v1.3.0~492
X-Git-Url: http://git.onelab.eu/?p=sliver-openvswitch.git;a=commitdiff_plain;h=2bd5b8145b7cf1851d51e258ab614414f2496aae

connmgr: Drop 'next_in_band_update' timer.

This timer used to exist because it was possible for in-band remote IP
addresses to change without any intentional configuration change in one
case: where controller discovery found a new controller.  Controller
discovery was removed long ago, but the reason for the timer had been
forgotten and so remained.  This commit removes it.
---

diff --git a/ofproto/connmgr.c b/ofproto/connmgr.c
index 44e1b2846..865fa2954 100644
--- a/ofproto/connmgr.c
+++ b/ofproto/connmgr.c
@@ -137,7 +137,6 @@ struct connmgr {
 
     /* In-band control. */
     struct in_band *in_band;
-    long long int next_in_band_update;
     struct sockaddr_in *extra_in_band_remotes;
     size_t n_extra_remotes;
     int in_band_queue;
@@ -172,7 +171,6 @@ connmgr_create(struct ofproto *ofproto,
     mgr->fail_mode = OFPROTO_FAIL_SECURE;
 
     mgr->in_band = NULL;
-    mgr->next_in_band_update = LLONG_MAX;
     mgr->extra_in_band_remotes = NULL;
     mgr->n_extra_remotes = 0;
     mgr->in_band_queue = -1;
@@ -242,9 +240,6 @@ connmgr_run(struct connmgr *mgr,
     size_t i;
 
     if (handle_openflow && mgr->in_band) {
-        if (time_msec() >= mgr->next_in_band_update) {
-            update_in_band_remotes(mgr);
-        }
         in_band_run(mgr->in_band);
     }
 
@@ -309,7 +304,6 @@ connmgr_wait(struct connmgr *mgr, bool handling_openflow)
         ofconn_wait(ofconn, handling_openflow);
     }
     if (handling_openflow && mgr->in_band) {
-        poll_timer_wait_until(mgr->next_in_band_update);
         in_band_wait(mgr->in_band);
     }
     if (handling_openflow && mgr->fail_open) {
@@ -614,7 +608,6 @@ update_in_band_remotes(struct connmgr *mgr)
             in_band_set_remotes(mgr->in_band, addrs, n_addrs);
         }
         in_band_set_queue(mgr->in_band, mgr->in_band_queue);
-        mgr->next_in_band_update = time_msec() + 1000;
     } else {
         in_band_destroy(mgr->in_band);
         mgr->in_band = NULL;