From bf71b09b48f5159737adc7b93129641d93715510 Mon Sep 17 00:00:00 2001 From: Sairam Venugopal Date: Fri, 2 Dec 2016 16:06:02 -0800 Subject: datapath-windows: Fix the redefinition of variables Some of the variables were getting re-defined in the function. This causes compiler warning in Windows SDK 10. Signed-off-by: Sairam Venugopal Acked-by: Alin Gabriel Serdean Signed-off-by: Gurucharan Shetty --- datapath-windows/ovsext/BufferMgmt.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'datapath-windows/ovsext/BufferMgmt.c') diff --git a/datapath-windows/ovsext/BufferMgmt.c b/datapath-windows/ovsext/BufferMgmt.c index 9c5b8fba8..6027c3513 100644 --- a/datapath-windows/ovsext/BufferMgmt.c +++ b/datapath-windows/ovsext/BufferMgmt.c @@ -1541,27 +1541,27 @@ OvsCompleteNBL(POVS_SWITCH_CONTEXT context, } if (flags & (OVS_BUFFER_PRIVATE_MDL | OVS_BUFFER_PRIVATE_DATA)) { - PNET_BUFFER nb = NET_BUFFER_LIST_FIRST_NB(nbl); - while (nb) { - PMDL mdl = NET_BUFFER_FIRST_MDL(nb); - NET_BUFFER_FIRST_MDL(nb) = NULL; + PNET_BUFFER nbTemp = NET_BUFFER_LIST_FIRST_NB(nbl); + while (nbTemp) { + PMDL mdl = NET_BUFFER_FIRST_MDL(nbTemp); + NET_BUFFER_FIRST_MDL(nbTemp) = NULL; ASSERT(mdl->Next == NULL); OvsFreeMDLAndData(mdl); - nb = NET_BUFFER_NEXT_NB(nb); + nbTemp = NET_BUFFER_NEXT_NB(nbTemp); } } if (flags & OVS_BUFFER_PRIVATE_NET_BUFFER) { - PNET_BUFFER nb, nextNb; + PNET_BUFFER nbTemp, nextNb; - nb = NET_BUFFER_LIST_FIRST_NB(nbl); - while (nb) { - nextNb = NET_BUFFER_NEXT_NB(nb); - NdisFreeNetBuffer(nb); + nbTemp = NET_BUFFER_LIST_FIRST_NB(nbl); + while (nbTemp) { + nextNb = NET_BUFFER_NEXT_NB(nbTemp); + NdisFreeNetBuffer(nbTemp); #ifdef DBG InterlockedDecrement((LONG volatile *)&ovsPool->nbCount); #endif - nb = nextNb; + nbTemp = nextNb; } NET_BUFFER_LIST_FIRST_NB(nbl) = NULL; } -- cgit v1.2.1