Re: [ovs-dev] [PATCH 3/5 v2] datapath-windows: clean code in gre

[Sairam Venugopal]

Acked-by: Sairam Venugopal 


On 10/27/16, 11:55 AM, "Alin Serdean" 
wrote:

>The purpose of this patch is to make the code more readable and
>fix a static analyzer warning.
>
>Signed-off-by: Alin Gabriel Serdean 
>---
> datapath-windows/ovsext/Gre.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/datapath-windows/ovsext/Gre.c b/datapath-windows/ovsext/Gre.c
>index 1976b08..7d6c0a2 100644
>--- a/datapath-windows/ovsext/Gre.c
>+++ b/datapath-windows/ovsext/Gre.c
>@@ -215,10 +215,10 @@ OvsDoEncapGre(POVS_VPORT_ENTRY vport,
> 
> /* L2 header */
> ethHdr = (EthHdr *)bufferStart;
>-ASSERT(((PCHAR)&fwdInfo->dstMacAddr + sizeof
>fwdInfo->dstMacAddr) ==
>-   (PCHAR)&fwdInfo->srcMacAddr);
> NdisMoveMemory(ethHdr->Destination, fwdInfo->dstMacAddr,
>-   sizeof ethHdr->Destination + sizeof
>ethHdr->Source);
>+   sizeof ethHdr->Destination);
>+NdisMoveMemory(ethHdr->Source, fwdInfo->srcMacAddr,
>+   sizeof ethHdr->Source);
> ethHdr->Type = htons(ETH_TYPE_IPV4);
> #if DBG
> counterHeadRoom -= sizeof *ethHdr;
>-- 
>2.9.2.windows.1
>___
>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=gje6zPH_Svgm1FQjvj-RwleJ6D9Dvd
>1ezH4qYtYt6wM&s=IVgW3lKIQA2U0XSSoaxxnuhugBuSBeb5O9nn0HhjQ1w&e= 

___
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev

[ovs-dev] [PATCH 3/5 v2] datapath-windows: clean code in gre

[Alin Serdean]

The purpose of this patch is to make the code more readable and
fix a static analyzer warning.

Signed-off-by: Alin Gabriel Serdean 
---
 datapath-windows/ovsext/Gre.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/datapath-windows/ovsext/Gre.c b/datapath-windows/ovsext/Gre.c
index 1976b08..7d6c0a2 100644
--- a/datapath-windows/ovsext/Gre.c
+++ b/datapath-windows/ovsext/Gre.c
@@ -215,10 +215,10 @@ OvsDoEncapGre(POVS_VPORT_ENTRY vport,
 
 /* L2 header */
 ethHdr = (EthHdr *)bufferStart;
-ASSERT(((PCHAR)&fwdInfo->dstMacAddr + sizeof fwdInfo->dstMacAddr) ==
-   (PCHAR)&fwdInfo->srcMacAddr);
 NdisMoveMemory(ethHdr->Destination, fwdInfo->dstMacAddr,
-   sizeof ethHdr->Destination + sizeof ethHdr->Source);
+   sizeof ethHdr->Destination);
+NdisMoveMemory(ethHdr->Source, fwdInfo->srcMacAddr,
+   sizeof ethHdr->Source);
 ethHdr->Type = htons(ETH_TYPE_IPV4);
 #if DBG
 counterHeadRoom -= sizeof *ethHdr;
-- 
2.9.2.windows.1
___
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev