| Message ID | 1472712111-30934-1-git-send-email-nithin@vmware.com |
|---|---|
| State | Superseded |
| Headers | show |
Acked-by: Sairam Venugopal <vsairam@vmware.com> On 8/31/16, 11:41 PM, "Nithin Raju" <nithin@vmware.com> wrote: >Also fix a minor indentation issue in User.c > >Signed-off-by: Nithin Raju <nithin@vmware.com> >--- > datapath-windows/ovsext/Flow.c | 1 + > datapath-windows/ovsext/User.c | 2 +- > 2 files changed, 2 insertions(+), 1 deletion(-) > >diff --git a/datapath-windows/ovsext/Flow.c >b/datapath-windows/ovsext/Flow.c >index 439fb28..2e8b42b 100644 >--- a/datapath-windows/ovsext/Flow.c >+++ b/datapath-windows/ovsext/Flow.c >@@ -2595,6 +2595,7 @@ OvsHashFlow(const OvsFlowKey *key) > UINT8 *start; > > ASSERT(key->tunKey.dst || offset == sizeof(OvsIPv4TunnelKey)); >+ ASSERT(!key->tunKey.dst || offset == >OvsGetFlowL2Offset(&key->tunKey)); > start = (UINT8 *)key + offset; > return OvsJhashBytes(start, size, 0); > } >diff --git a/datapath-windows/ovsext/User.c >b/datapath-windows/ovsext/User.c >index c7ac284..6ca0991 100644 >--- a/datapath-windows/ovsext/User.c >+++ b/datapath-windows/ovsext/User.c >@@ -463,7 +463,7 @@ OvsExecuteDpIoctl(OvsPacketExecute *execute) > NdisAcquireRWLockRead(gOvsSwitchContext->dispatchLock, >&lockState, 0); > ndisStatus = OvsActionsExecute(gOvsSwitchContext, NULL, pNbl, > vport ? vport->portNo : >- OVS_DPPORT_NUMBER_INVALID, >+ OVS_DPPORT_NUMBER_INVALID, > >NDIS_SEND_FLAGS_SWITCH_DESTINATION_GROUP, > &key, NULL, &layers, actions, > execute->actionsLen); >-- >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=doCintP84g0QhEOxKWYZDHsL7uj1xF >zy4hKB2jUiTKs&s=WM0lzV0BiVRMicQj2xrc_nLWgvI_l3r2NwKCaqxkgLk&e=
diff --git a/datapath-windows/ovsext/Flow.c b/datapath-windows/ovsext/Flow.c index 439fb28..2e8b42b 100644 --- a/datapath-windows/ovsext/Flow.c +++ b/datapath-windows/ovsext/Flow.c @@ -2595,6 +2595,7 @@ OvsHashFlow(const OvsFlowKey *key) UINT8 *start; ASSERT(key->tunKey.dst || offset == sizeof(OvsIPv4TunnelKey)); + ASSERT(!key->tunKey.dst || offset == OvsGetFlowL2Offset(&key->tunKey)); start = (UINT8 *)key + offset; return OvsJhashBytes(start, size, 0); } diff --git a/datapath-windows/ovsext/User.c b/datapath-windows/ovsext/User.c index c7ac284..6ca0991 100644 --- a/datapath-windows/ovsext/User.c +++ b/datapath-windows/ovsext/User.c @@ -463,7 +463,7 @@ OvsExecuteDpIoctl(OvsPacketExecute *execute) NdisAcquireRWLockRead(gOvsSwitchContext->dispatchLock, &lockState, 0); ndisStatus = OvsActionsExecute(gOvsSwitchContext, NULL, pNbl, vport ? vport->portNo : - OVS_DPPORT_NUMBER_INVALID, + OVS_DPPORT_NUMBER_INVALID, NDIS_SEND_FLAGS_SWITCH_DESTINATION_GROUP, &key, NULL, &layers, actions, execute->actionsLen);
Also fix a minor indentation issue in User.c Signed-off-by: Nithin Raju <nithin@vmware.com> --- datapath-windows/ovsext/Flow.c | 1 + datapath-windows/ovsext/User.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)