X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fip%2Fip4_pg.c;h=2ccd2b45a6f193fce6d16b3a7aa079e572a0f8b6;hb=6dc0c8d14745e1d55f62415a3a40454ff820d9ad;hp=9697a3b9c89cc35fefe5ba6c2f3865d4c0290467;hpb=7cd468a3d7dee7d6c92f69a0bb7061ae208ec727;p=vpp.git

diff --git a/src/vnet/ip/ip4_pg.c b/src/vnet/ip/ip4_pg.c
index 9697a3b9c89..2ccd2b45a6f 100644
--- a/src/vnet/ip/ip4_pg.c
+++ b/src/vnet/ip/ip4_pg.c
@@ -90,8 +90,8 @@ compute_length_and_or_checksum (vlib_main_t * vm,
 	  ip0->checksum = ~ip_csum_fold (sum0);
 	  ip1->checksum = ~ip_csum_fold (sum1);
 
-	  ASSERT (ip0->checksum == ip4_header_checksum (ip0));
-	  ASSERT (ip1->checksum == ip4_header_checksum (ip1));
+	  ASSERT (ip4_header_checksum_is_valid (ip0));
+	  ASSERT (ip4_header_checksum_is_valid (ip1));
 	}
     }
 
@@ -123,7 +123,7 @@ compute_length_and_or_checksum (vlib_main_t * vm,
 	  ip4_partial_header_checksum_x1 (ip0, sum0);
 	  ip0->checksum = ~ip_csum_fold (sum0);
 
-	  ASSERT (ip0->checksum == ip4_header_checksum (ip0));
+	  ASSERT (ip4_header_checksum_is_valid (ip0));
 	}
     }
 }
@@ -344,7 +344,7 @@ found:
 
 	/* See if header is all fixed and specified except for
 	   checksum field. */
-	memset (&cmp_mask, ~0, sizeof (cmp_mask));
+	clib_memset (&cmp_mask, ~0, sizeof (cmp_mask));
 	cmp_mask.checksum = 0;
 
 	pg_edit_group_get_fixed_packet_data (s, group_index,