datapath-windows: clean code in stt

The purpose of this patch is to make the code more readable and fix a static analyzer warning. Signed-off-by: Alin Gabriel Serdean <[email protected]> Acked-by: Sairam Venugopal <[email protected]> Signed-off-by: Gurucharan Shetty <[email protected]>
venkatgattupalli · Nov 4, 2016 · 4f46029 · 4f46029
1 parent e8830d5
commit 4f46029
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/datapath-windows/ovsext/Stt.c b/datapath-windows/ovsext/Stt.c
@@ -278,10 +278,10 @@ OvsDoEncapStt(POVS_VPORT_ENTRY vport,
         sttHdr = (SttHdr *) (outerTcpHdr + 1);
 
         /* L2 header */
-        ASSERT(((PCHAR)&fwdInfo->dstMacAddr + sizeof fwdInfo->dstMacAddr) ==
-                (PCHAR)&fwdInfo->srcMacAddr);
         NdisMoveMemory(outerEthHdr->Destination, fwdInfo->dstMacAddr,
-                        sizeof outerEthHdr->Destination + sizeof outerEthHdr->Source);
+                       sizeof outerEthHdr->Destination);
+        NdisMoveMemory(outerEthHdr->Source, fwdInfo->srcMacAddr,
+                       sizeof outerEthHdr->Source);
         outerEthHdr->Type = htons(ETH_TYPE_IPV4);
 
         /* L3 header */