[ovs-dev] [PATCH] datapath-windows: Fix the isActivated flag in OvsActivateSwitch

[Sairam Venugopal]

Thanks for fixing this.

Acked-by: Sairam Venugopal <vsairam at vmware.com>


On 11/10/16, 4:38 PM, "Shashank Ram" <rams at vmware.com> wrote:

>Previously, the driver would enter a deadlock because
>the OvsInitConfiguredSwitchNics() function would wait
>till switchContext->isActivated flag is set.
>
>Signed-off-by: Shashank Ram <rams at vmware.com>
>---
> datapath-windows/ovsext/Switch.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
>diff --git a/datapath-windows/ovsext/Switch.c
>b/datapath-windows/ovsext/Switch.c
>index 49711a9..bb296fa 100644
>--- a/datapath-windows/ovsext/Switch.c
>+++ b/datapath-windows/ovsext/Switch.c
>@@ -553,6 +553,8 @@ OvsActivateSwitch(POVS_SWITCH_CONTEXT switchContext)
>
>     ASSERT(!switchContext->isActivated);
>
>+    switchContext->isActivated = TRUE;
>+
>     OVS_LOG_TRACE("Enter: activate switch %p, dpNo: %ld",
>                   switchContext, switchContext->dpNo);
>
>@@ -571,9 +573,11 @@ OvsActivateSwitch(POVS_SWITCH_CONTEXT switchContext)
>         goto cleanup;
>     }
>
>-    switchContext->isActivated = TRUE;
>-
> cleanup:
>+    if (status != NDIS_STATUS_SUCCESS) {
>+        switchContext->isActivated = FALSE;
>+    }
>+
>     OVS_LOG_TRACE("Exit: activate switch:%p, isActivated: %s, status =
>%lx",
>                   switchContext,
>                   (switchContext->isActivated ? "TRUE" : "FALSE"),
>status);
>--
>2.6.2
>
>_______________________________________________
>dev mailing list
>dev at openvswitch.org
>https://urldefense.proofpoint.com/v2/url?u=https-3A__mail.openvswitch.org_
>mailman_listinfo_ovs-2Ddev&d=CwICAg&c=Sqcl0Ez6M0X8aeM67LKIiDJAXVeAw-YihVMN
>tXt-uEs&r=Dcruz40PROJ40ROzSpxyQSLw6fcrOWpJgEcEmNR3JEQ&m=urQADE1o_wlpVVOgWb
>jWuUEdFv9tYds8YpoNtLhnRP4&s=OXQThTeo6l5uVuTggriz6P18ki9ZLJsSc89KVvHJNE8&e=
>