| Message ID | 20161203000602.35152-1-vsairam@vmware.com |
|---|---|
| State | Accepted |
| Delegated to: | Guru Shetty |
| Headers | show |
Acked-by: Alin Gabriel Serdean <aserdean@cloudbasesolutions.com> Thanks, Alin. > -----Original Message----- > From: ovs-dev-bounces@openvswitch.org [mailto:ovs-dev- > bounces@openvswitch.org] On Behalf Of Sairam Venugopal > Sent: Saturday, December 3, 2016 2:06 AM > To: dev@openvswitch.org > Subject: [ovs-dev] [PATCH] 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 <vsairam@vmware.com>
On 2 December 2016 at 16:06, Sairam Venugopal <vsairam@vmware.com> wrote: > Some of the variables were getting re-defined in the function. This causes > compiler warning in Windows SDK 10. > > Signed-off-by: Sairam Venugopal <vsairam@vmware.com> > Applied, thanks! > --- > datapath-windows/ovsext/BufferMgmt.c | 22 +++++++++++----------- > datapath-windows/ovsext/Offload.c | 8 ++++---- > 2 files changed, 15 insertions(+), 15 deletions(-) > > diff --git a/datapath-windows/ovsext/BufferMgmt.c > b/datapath-windows/ovsext/BufferMgmt.c > index 9c5b8fb..6027c35 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; > } > diff --git a/datapath-windows/ovsext/Offload.c b/datapath-windows/ovsext/ > Offload.c > index 3246f5e..f3ab0e1 100644 > --- a/datapath-windows/ovsext/Offload.c > +++ b/datapath-windows/ovsext/Offload.c > @@ -66,12 +66,12 @@ CalculateOnesComplement(UINT8 *start, > UINT64 initial, > BOOLEAN isEvenStart) > { > - UINT64 sum = 0, val; > + UINT64 sum = 0, val64; > UINT64 *src = (UINT64 *)start; > while (totalLength > 7) { > - val = *src; > - sum += val; > - if (sum < val) sum++; > + val64 = *src; > + sum += val64; > + if (sum < val64) sum++; > src++; > totalLength -= 8; > } > -- > 2.9.0.windows.1 > > _______________________________________________ > dev mailing list > dev@openvswitch.org > https://mail.openvswitch.org/mailman/listinfo/ovs-dev >
diff --git a/datapath-windows/ovsext/BufferMgmt.c b/datapath-windows/ovsext/BufferMgmt.c index 9c5b8fb..6027c35 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; } diff --git a/datapath-windows/ovsext/Offload.c b/datapath-windows/ovsext/Offload.c index 3246f5e..f3ab0e1 100644 --- a/datapath-windows/ovsext/Offload.c +++ b/datapath-windows/ovsext/Offload.c @@ -66,12 +66,12 @@ CalculateOnesComplement(UINT8 *start, UINT64 initial, BOOLEAN isEvenStart) { - UINT64 sum = 0, val; + UINT64 sum = 0, val64; UINT64 *src = (UINT64 *)start; while (totalLength > 7) { - val = *src; - sum += val; - if (sum < val) sum++; + val64 = *src; + sum += val64; + if (sum < val64) sum++; src++; totalLength -= 8; }
Some of the variables were getting re-defined in the function. This causes compiler warning in Windows SDK 10. Signed-off-by: Sairam Venugopal <vsairam@vmware.com> --- datapath-windows/ovsext/BufferMgmt.c | 22 +++++++++++----------- datapath-windows/ovsext/Offload.c | 8 ++++---- 2 files changed, 15 insertions(+), 15 deletions(-)