[ovs-dev] [PATCH 1/2] bridge: Do not wait for status update when there is no bridge.

[Alex Wang]

Signed-off-by: Alex Wang <alexw at nicira.com>
---
 vswitchd/bridge.c |    8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c
index 2e90ea2..161ba14 100644
--- a/vswitchd/bridge.c
+++ b/vswitchd/bridge.c
@@ -2826,12 +2826,6 @@ run_status_update(void)
 static void
 status_update_wait(void)
 {
-    /* This prevents the process from constantly waking up on
-     * connectivity seq, when there is no connection to ovsdb. */
-    if (!ovsdb_idl_has_lock(idl)) {
-        return;
-    }
-
     /* If the 'status_txn' is non-null (transaction incomplete), waits for the
      * transaction to complete.  If the status update to database needs to be
      * run again (transaction fails), registers a timeout in
@@ -3016,9 +3010,9 @@ bridge_wait(void)
         }
 
         poll_timer_wait_until(stats_timer);
+        status_update_wait();
     }
 
-    status_update_wait();
     system_stats_wait();
 }
 
-- 
1.7.9.5