From: Nithin Raju <nithin@vmware.com>
Date: Tue, 17 May 2016 17:15:22 +0000 (-0700)
Subject: datapath-windows: remove extract flow in OvsDoRecirc()
X-Git-Tag: v2.12.3~5491
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=bfac27150b4dedd6bb143299ef9bb1a31e448e62;p=mirror_ovs.git

datapath-windows: remove extract flow in OvsDoRecirc()

It is not necessary to do a flow extract in OvsDoRecirc().
In fact, doing it would overwrite the tunnel key within
'key'. So, let's remove the call.

Signed-off-by: Nithin Raju <nithin@vmware.com>
Signed-off-by: Sairam Venugopal <vsairam@vmware.com>
Co-Authored-by: Sairam Venugopal <vsairam@vmware.com>
Acked-by: Sairam Venugopal <vsairam@vmware.com>
Acked-by: Paul-Daniel Boca <pboca@cloudbasesolutions.com>
Signed-off-by: Joe Stringer <joe@ovn.org>
---

diff --git a/datapath-windows/ovsext/Actions.c b/datapath-windows/ovsext/Actions.c
index 5ad29ee60..4edf7d0ec 100644
--- a/datapath-windows/ovsext/Actions.c
+++ b/datapath-windows/ovsext/Actions.c
@@ -1989,15 +1989,6 @@ OvsDoRecirc(POVS_SWITCH_CONTEXT switchContext,
                          NET_BUFFER_LIST_SWITCH_FORWARDING_DETAIL(curNbl),
                          completionList, layers, TRUE);
 
-    status = OvsExtractFlow(ovsFwdCtx.curNbl, ovsFwdCtx.srcVportNo, key,
-                            &ovsFwdCtx.layers, NULL);
-    if (status != NDIS_STATUS_SUCCESS) {
-        OvsCompleteNBLForwardingCtx(&ovsFwdCtx,
-            L"OVS-Dropped due to extract flow failure");
-        ovsActionStats.failedFlowMiss++;
-        return NDIS_STATUS_FAILURE;
-    }
-
     flow = OvsLookupFlow(&ovsFwdCtx.switchContext->datapath, key, &hash, FALSE);
     if (flow) {
         UINT32 level = OvsDeferredActionsLevelGet();