[ovs-dev] [PATCH] datpath-windows: make PacketIO.c compilable with WDK8

Nithin Raju nithin at vmware.com
Tue May 26 06:20:23 UTC 2015


There's some code in PacketIO.c that is supported in WDK 8.1 only.
The variable declarations for that code must also be WDK 8.1 only.

Signed-off-by: Nithin Raju <nithin at vmware.com>
---
 datapath-windows/ovsext/PacketIO.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/datapath-windows/ovsext/PacketIO.c b/datapath-windows/ovsext/PacketIO.c
index 902e9aa..ed629fd 100644
--- a/datapath-windows/ovsext/PacketIO.c
+++ b/datapath-windows/ovsext/PacketIO.c
@@ -216,8 +216,10 @@ OvsStartNBLIngress(POVS_SWITCH_CONTEXT switchContext,
     LIST_ENTRY missedPackets;
     UINT32 num = 0;
     OvsCompletionList completionList;
+#if (NDIS_SUPPORT_NDIS640)
     PNET_BUFFER_LIST nativeForwardedNbls = NULL;
     PNET_BUFFER_LIST *nextNativeForwardedNbl = &nativeForwardedNbls;
+#endif
 
     dispatch = NDIS_TEST_SEND_AT_DISPATCH_LEVEL(SendFlags)?
                                             NDIS_RWL_AT_DISPATCH_LEVEL : 0;
@@ -254,7 +256,7 @@ OvsStartNBLIngress(POVS_SWITCH_CONTEXT switchContext,
                 sourcePort == switchContext->virtualExternalPortId);
             continue;
         }
-#endif
+#endif /* NDIS_SUPPORT_NDIS640 */
 
         /* Ethernet Header is a guaranteed safe access. */
         curNb = NET_BUFFER_LIST_FIRST_NB(curNbl);
@@ -353,11 +355,13 @@ dropit:
         }
     }
 
+#if (NDIS_SUPPORT_NDIS640)
     if (nativeForwardedNbls) {
         /* This is NVGRE encapsulated traffic and is forwarded to NDIS
          * in order to be handled by the HNV module. */
         OvsSendNBLIngress(switchContext, nativeForwardedNbls, SendFlags);
     }
+#endif /* NDIS_SUPPORT_NDIS640 */
 
     /* Queue the missed packets. */
     OvsQueuePackets(&missedPackets, num);
-- 
1.8.5.6




More information about the dev mailing list