| Message ID | 1476137705-56742-1-git-send-email-rams@vmware.com |
|---|---|
| State | Accepted |
| Headers | show |
Acked-by: Sairam Venugopal <vsairam@vmware.com> On 10/10/16, 3:15 PM, "Shashank Ram" <rams@vmware.com> wrote: >@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 <rams@vmware.com> >--- > datapath-windows/ovsext/Switch.c | 7 ++----- > 1 file changed, 2 insertions(+), 5 deletions(-) > >diff --git a/datapath-windows/ovsext/Switch.c >b/datapath-windows/ovsext/Switch.c >index 825fa3c..49711a9 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); >-- >2.6.2 > >_______________________________________________ >dev mailing list >dev@openvswitch.org >https://urldefense.proofpoint.com/v2/url?u=http-3A__openvswitch.org_mailma >n_listinfo_dev&d=CwIGaQ&c=Sqcl0Ez6M0X8aeM67LKIiDJAXVeAw-YihVMNtXt-uEs&r=Dc >ruz40PROJ40ROzSpxyQSLw6fcrOWpJgEcEmNR3JEQ&m=JTQF9lK7WrFRmjxQdtU7cHaXMjUSVN >R88qRe8HumYqs&s=sIOOdG_D2MkFJp_802P-OYepagoY0W56f4q75MyFr8Q&e=
Acked-by: Nithin Raju <nithin@vmware.com> Thanks, -- Nithin -----Original Message----- From: dev <dev-bounces@openvswitch.org> on behalf of Sairam Venugopal <vsairam@vmware.com> Date: Monday, October 10, 2016 at 3:43 PM To: Shashank Ram <rams@vmware.com>, "dev@openvswitch.org" <dev@openvswitch.org> Subject: Re: [ovs-dev] [PATCH v2] datapath-windows: Set isActivated flag only on success >Acked-by: Sairam Venugopal <vsairam@vmware.com> > > >On 10/10/16, 3:15 PM, "Shashank Ram" <rams@vmware.com> wrote: > >>@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 <rams@vmware.com> >>--- >> datapath-windows/ovsext/Switch.c | 7 ++----- >> 1 file changed, 2 insertions(+), 5 deletions(-) >> >>diff --git a/datapath-windows/ovsext/Switch.c >>b/datapath-windows/ovsext/Switch.c >>index 825fa3c..49711a9 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); >>-- >>2.6.2 >> >>_______________________________________________ >>dev mailing list >>dev@openvswitch.org >>https://urldefense.proofpoint.com/v2/url?u=http-3A__openvswitch.org_mailm >>a >>n_listinfo_dev&d=CwIGaQ&c=Sqcl0Ez6M0X8aeM67LKIiDJAXVeAw-YihVMNtXt-uEs&r=D >>c >>ruz40PROJ40ROzSpxyQSLw6fcrOWpJgEcEmNR3JEQ&m=JTQF9lK7WrFRmjxQdtU7cHaXMjUSV >>N >>R88qRe8HumYqs&s=sIOOdG_D2MkFJp_802P-OYepagoY0W56f4q75MyFr8Q&e= > >_______________________________________________ >dev mailing list >dev@openvswitch.org >https://urldefense.proofpoint.com/v2/url?u=http-3A__openvswitch.org_mailma >n_listinfo_dev&d=CwIGaQ&c=Sqcl0Ez6M0X8aeM67LKIiDJAXVeAw-YihVMNtXt-uEs&r=pN >HQcdr7B40b4h6Yb7FIedI1dnBsxdDuTLBYD3JqV80&m=_ZtGBUyhuomRlS4fnlG7I23NS4pvgd >sN0pnQDt9zuNg&s=m0Vl611an4DlpDnyTiMeQlvCBQjwMAdpXNG5YZu3VZg&e=
diff --git a/datapath-windows/ovsext/Switch.c b/datapath-windows/ovsext/Switch.c index 825fa3c..49711a9 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);
@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 <rams@vmware.com> --- datapath-windows/ovsext/Switch.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) -- 2.6.2