From 01dee7de6661bb2cd5ff20085dbfb7c1d8084d01 Mon Sep 17 00:00:00 2001 From: Shashank Ram Date: Mon, 10 Oct 2016 15:15:05 -0700 Subject: datapath-windows: Set isActivated flag only on success @Switch.c: Modifies OvsActivateSwitch() function to mark the switch as activated only if the the status is success. The callers itself only call this method when the isActivated flag is unset. Signed-off-by: Shashank Ram Acked-by: Sairam Venugopal Acked-by: Nithin Raju Signed-off-by: Gurucharan Shetty --- datapath-windows/ovsext/Switch.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'datapath-windows/ovsext/Switch.c') diff --git a/datapath-windows/ovsext/Switch.c b/datapath-windows/ovsext/Switch.c index 825fa3c8f..49711a9ef 100644 --- a/datapath-windows/ovsext/Switch.c +++ b/datapath-windows/ovsext/Switch.c @@ -556,7 +556,6 @@ OvsActivateSwitch(POVS_SWITCH_CONTEXT switchContext) OVS_LOG_TRACE("Enter: activate switch %p, dpNo: %ld", switchContext, switchContext->dpNo); - switchContext->isActivated = TRUE; status = OvsAddConfiguredSwitchPorts(switchContext); if (status != NDIS_STATUS_SUCCESS) { @@ -572,11 +571,9 @@ OvsActivateSwitch(POVS_SWITCH_CONTEXT switchContext) goto cleanup; } -cleanup: - if (status != NDIS_STATUS_SUCCESS) { - switchContext->isActivated = TRUE; - } + switchContext->isActivated = TRUE; +cleanup: OVS_LOG_TRACE("Exit: activate switch:%p, isActivated: %s, status = %lx", switchContext, (switchContext->isActivated ? "TRUE" : "FALSE"), status); -- cgit v1.2.1