commit 213b5aae860c2a9d5de8d4d070d0d2091af699f5
author Damjan Marion <damarion@cisco.com> Thu Jul 13 21:19:27 2017 +0200
committer Dave Barach <openvpp@barachs.net> Fri Jul 14 15:41:57 2017 +0000
tree cd86f1ed8a60340b477022dc545835e62c14a867
parent 072401e8096c648b91f958bd911f64ce24fecff9

vnet_buffer_t flags cleanup

Change-Id: I123eccea98abafeb31f25d2a162501e2eded60d4
Signed-off-by: Damjan Marion <damarion@cisco.com>

src/vnet/vxlan-gpe/decap.c

diff --git a/src/vnet/vxlan-gpe/decap.c b/src/vnet/vxlan-gpe/decap.c
index 075b0f5..1b3a8b0 100644
--- a/src/vnet/vxlan-gpe/decap.c
+++ b/src/vnet/vxlan-gpe/decap.c
@@ -857,7 +857,7 @@
 	    }
 
 	  flags0 = b0->flags;
-	  good_udp0 = (flags0 & IP_BUFFER_L4_CHECKSUM_CORRECT) != 0;
+	  good_udp0 = (flags0 & VNET_BUFFER_F_L4_CHECKSUM_CORRECT) != 0;
 
 	  /* Don't verify UDP checksum for packets with explicit zero checksum. */
 	  good_udp0 |= udp0->checksum == 0;
@@ -873,14 +873,14 @@
 	  /* Verify UDP checksum */
 	  if (PREDICT_FALSE (!good_udp0))
 	    {
-	      if ((flags0 & IP_BUFFER_L4_CHECKSUM_COMPUTED) == 0)
+	      if ((flags0 & VNET_BUFFER_F_L4_CHECKSUM_COMPUTED) == 0)
 	        {
 		  if (is_ip4)
 		    flags0 = ip4_tcp_udp_validate_checksum (vm, b0);
 		  else
 		    flags0 = ip6_tcp_udp_icmp_validate_checksum (vm, b0);
 		  good_udp0 =
-		    (flags0 & IP_BUFFER_L4_CHECKSUM_CORRECT) != 0;
+		    (flags0 & VNET_BUFFER_F_L4_CHECKSUM_CORRECT) != 0;
 	        }
 	    }
 
@@ -939,7 +939,7 @@
 	    }
 
 	  flags1 = b1->flags;
-	  good_udp1 = (flags1 & IP_BUFFER_L4_CHECKSUM_CORRECT) != 0;
+	  good_udp1 = (flags1 & VNET_BUFFER_F_L4_CHECKSUM_CORRECT) != 0;
 
 	  /* Don't verify UDP checksum for packets with explicit zero checksum. */
 	  good_udp1 |= udp1->checksum == 0;
@@ -955,14 +955,14 @@
 	  /* Verify UDP checksum */
 	  if (PREDICT_FALSE (!good_udp1))
 	    {
-	      if ((flags1 & IP_BUFFER_L4_CHECKSUM_COMPUTED) == 0)
+	      if ((flags1 & VNET_BUFFER_F_L4_CHECKSUM_COMPUTED) == 0)
 	        {
 		  if (is_ip4)
 		    flags1 = ip4_tcp_udp_validate_checksum (vm, b1);
 		  else
 		    flags1 = ip6_tcp_udp_icmp_validate_checksum (vm, b1);
 		  good_udp1 =
-		    (flags1 & IP_BUFFER_L4_CHECKSUM_CORRECT) != 0;
+		    (flags1 & VNET_BUFFER_F_L4_CHECKSUM_CORRECT) != 0;
 	        }
 	    }
 
@@ -1055,7 +1055,7 @@
 	    }
 
 	  flags0 = b0->flags;
-	  good_udp0 = (flags0 & IP_BUFFER_L4_CHECKSUM_CORRECT) != 0;
+	  good_udp0 = (flags0 & VNET_BUFFER_F_L4_CHECKSUM_CORRECT) != 0;
 
 	  /* Don't verify UDP checksum for packets with explicit zero checksum. */
 	  good_udp0 |= udp0->checksum == 0;
@@ -1071,14 +1071,14 @@
 	  /* Verify UDP checksum */
 	  if (PREDICT_FALSE (!good_udp0))
 	    {
-	      if ((flags0 & IP_BUFFER_L4_CHECKSUM_COMPUTED) == 0)
+	      if ((flags0 & VNET_BUFFER_F_L4_CHECKSUM_COMPUTED) == 0)
 	        {
 		  if (is_ip4)
 		    flags0 = ip4_tcp_udp_validate_checksum (vm, b0);
 		  else
 		    flags0 = ip6_tcp_udp_icmp_validate_checksum (vm, b0);
 		  good_udp0 =
-		    (flags0 & IP_BUFFER_L4_CHECKSUM_CORRECT) != 0;
+		    (flags0 & VNET_BUFFER_F_L4_CHECKSUM_CORRECT) != 0;
 	        }
 	    }