| Message ID | 1449775011-46369-1-git-send-email-nithin@vmware.com |
|---|---|
| State | Accepted |
| Headers | show |
Acked-by: Alin Gabriel Serdean <aserdean@cloudbasesolutions.com> Thanks, Alin. > -----Mesaj original----- > De la: dev [mailto:dev-bounces@openvswitch.org] În numele Nithin Raju > Trimis: Thursday, December 10, 2015 9:17 PM > Către: dev@openvswitch.org > Subiect: [ovs-dev] [PATCH] datapath-windows: remove ASSERT in > OvsDoFlowLookupOutput() > > We needed this ASSERT earlier to catch unexpected cases. This code seems > to be fairly stable, and we can remove the ASSERT. > > It is annoying to be hitting this ASSERT while changing the internal adapter > properties. > > Signed-off-by: Nithin Raju <nithin@vmware.com> > --- > datapath-windows/ovsext/Actions.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/datapath-windows/ovsext/Actions.c b/datapath- > windows/ovsext/Actions.c > index f6c029b..bb22833 100644 > --- a/datapath-windows/ovsext/Actions.c > +++ b/datapath-windows/ovsext/Actions.c > @@ -556,7 +556,6 @@ OvsDoFlowLookupOutput(OvsForwardingContext > *ovsFwdCtx) > POVS_VPORT_ENTRY vport = > OvsFindVportByPortNo(ovsFwdCtx->switchContext, ovsFwdCtx- > >srcVportNo); > if (vport == NULL || vport->ovsState != OVS_STATE_CONNECTED) { > - ASSERT(FALSE); // XXX: let's catch this for now > OvsCompleteNBLForwardingCtx(ovsFwdCtx, > L"OVS-Dropped due to internal/tunnel port removal"); > ovsActionStats.noVport++; > -- > 1.8.5.6 > > _______________________________________________ > dev mailing list > dev@openvswitch.org > http://openvswitch.org/mailman/listinfo/dev
On Thu, Dec 10, 2015 at 11:16:51AM -0800, Nithin Raju wrote: > We needed this ASSERT earlier to catch unexpected cases. This code seems > to be fairly stable, and we can remove the ASSERT. > > It is annoying to be hitting this ASSERT while changing the internal > adapter properties. > > Signed-off-by: Nithin Raju <nithin@vmware.com> Thanks, applied to master and branch-2.5.
diff --git a/datapath-windows/ovsext/Actions.c b/datapath-windows/ovsext/Actions.c index f6c029b..bb22833 100644 --- a/datapath-windows/ovsext/Actions.c +++ b/datapath-windows/ovsext/Actions.c @@ -556,7 +556,6 @@ OvsDoFlowLookupOutput(OvsForwardingContext *ovsFwdCtx) POVS_VPORT_ENTRY vport = OvsFindVportByPortNo(ovsFwdCtx->switchContext, ovsFwdCtx->srcVportNo); if (vport == NULL || vport->ovsState != OVS_STATE_CONNECTED) { - ASSERT(FALSE); // XXX: let's catch this for now OvsCompleteNBLForwardingCtx(ovsFwdCtx, L"OVS-Dropped due to internal/tunnel port removal"); ovsActionStats.noVport++;
We needed this ASSERT earlier to catch unexpected cases. This code seems to be fairly stable, and we can remove the ASSERT. It is annoying to be hitting this ASSERT while changing the internal adapter properties. Signed-off-by: Nithin Raju <nithin@vmware.com> --- datapath-windows/ovsext/Actions.c | 1 - 1 file changed, 1 deletion(-)