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/ip/ip4_forward.c

diff --git a/src/vnet/ip/ip4_forward.c b/src/vnet/ip/ip4_forward.c
index b8dfa84..8dd927d 100755
--- a/src/vnet/ip/ip4_forward.c
+++ b/src/vnet/ip/ip4_forward.c
@@ -1509,15 +1509,15 @@
   udp0 = (void *) (ip0 + 1);
   if (ip0->protocol == IP_PROTOCOL_UDP && udp0->checksum == 0)
     {
-      p0->flags |= (IP_BUFFER_L4_CHECKSUM_COMPUTED
-		    | IP_BUFFER_L4_CHECKSUM_CORRECT);
+      p0->flags |= (VNET_BUFFER_F_L4_CHECKSUM_COMPUTED
+		    | VNET_BUFFER_F_L4_CHECKSUM_CORRECT);
       return p0->flags;
     }
 
   sum16 = ip4_tcp_udp_compute_checksum (vm, p0, ip0);
 
-  p0->flags |= (IP_BUFFER_L4_CHECKSUM_COMPUTED
-		| ((sum16 == 0) << LOG2_IP_BUFFER_L4_CHECKSUM_CORRECT));
+  p0->flags |= (VNET_BUFFER_F_L4_CHECKSUM_COMPUTED
+		| ((sum16 == 0) << VNET_BUFFER_F_LOG2_L4_CHECKSUM_CORRECT));
 
   return p0->flags;
 }
@@ -1629,8 +1629,8 @@
 	  flags0 = p0->flags;
 	  flags1 = p1->flags;
 
-	  good_tcp_udp0 = (flags0 & IP_BUFFER_L4_CHECKSUM_CORRECT) != 0;
-	  good_tcp_udp1 = (flags1 & IP_BUFFER_L4_CHECKSUM_CORRECT) != 0;
+	  good_tcp_udp0 = (flags0 & VNET_BUFFER_F_L4_CHECKSUM_CORRECT) != 0;
+	  good_tcp_udp1 = (flags1 & VNET_BUFFER_F_L4_CHECKSUM_CORRECT) != 0;
 
 	  udp0 = ip4_next_header (ip0);
 	  udp1 = ip4_next_header (ip1);
@@ -1657,19 +1657,19 @@
 	      if (is_tcp_udp0)
 		{
 		  if (is_tcp_udp0
-		      && !(flags0 & IP_BUFFER_L4_CHECKSUM_COMPUTED))
+		      && !(flags0 & VNET_BUFFER_F_L4_CHECKSUM_COMPUTED))
 		    flags0 = ip4_tcp_udp_validate_checksum (vm, p0);
 		  good_tcp_udp0 =
-		    (flags0 & IP_BUFFER_L4_CHECKSUM_CORRECT) != 0;
+		    (flags0 & VNET_BUFFER_F_L4_CHECKSUM_CORRECT) != 0;
 		  good_tcp_udp0 |= is_udp0 && udp0->checksum == 0;
 		}
 	      if (is_tcp_udp1)
 		{
 		  if (is_tcp_udp1
-		      && !(flags1 & IP_BUFFER_L4_CHECKSUM_COMPUTED))
+		      && !(flags1 & VNET_BUFFER_F_L4_CHECKSUM_COMPUTED))
 		    flags1 = ip4_tcp_udp_validate_checksum (vm, p1);
 		  good_tcp_udp1 =
-		    (flags1 & IP_BUFFER_L4_CHECKSUM_CORRECT) != 0;
+		    (flags1 & VNET_BUFFER_F_L4_CHECKSUM_CORRECT) != 0;
 		  good_tcp_udp1 |= is_udp1 && udp1->checksum == 0;
 		}
 	    }
@@ -1817,7 +1817,7 @@
 
 	  flags0 = p0->flags;
 
-	  good_tcp_udp0 = (flags0 & IP_BUFFER_L4_CHECKSUM_CORRECT) != 0;
+	  good_tcp_udp0 = (flags0 & VNET_BUFFER_F_L4_CHECKSUM_CORRECT) != 0;
 
 	  udp0 = ip4_next_header (ip0);
 
@@ -1837,10 +1837,10 @@
 	      if (is_tcp_udp0)
 		{
 		  if (is_tcp_udp0
-		      && !(flags0 & IP_BUFFER_L4_CHECKSUM_COMPUTED))
+		      && !(flags0 & VNET_BUFFER_F_L4_CHECKSUM_COMPUTED))
 		    flags0 = ip4_tcp_udp_validate_checksum (vm, p0);
 		  good_tcp_udp0 =
-		    (flags0 & IP_BUFFER_L4_CHECKSUM_CORRECT) != 0;
+		    (flags0 & VNET_BUFFER_F_L4_CHECKSUM_CORRECT) != 0;
 		  good_tcp_udp0 |= is_udp0 && udp0->checksum == 0;
 		}
 	    }
@@ -2428,7 +2428,7 @@
 
 	  /* Decrement TTL & update checksum.
 	     Works either endian, so no need for byte swap. */
-	  if (PREDICT_TRUE (!(p0->flags & VNET_BUFFER_LOCALLY_ORIGINATED)))
+	  if (PREDICT_TRUE (!(p0->flags & VNET_BUFFER_F_LOCALLY_ORIGINATED)))
 	    {
 	      i32 ttl0 = ip0->ttl;
 
@@ -2461,9 +2461,9 @@
 	    }
 	  else
 	    {
-	      p0->flags &= ~VNET_BUFFER_LOCALLY_ORIGINATED;
+	      p0->flags &= ~VNET_BUFFER_F_LOCALLY_ORIGINATED;
 	    }
-	  if (PREDICT_TRUE (!(p1->flags & VNET_BUFFER_LOCALLY_ORIGINATED)))
+	  if (PREDICT_TRUE (!(p1->flags & VNET_BUFFER_F_LOCALLY_ORIGINATED)))
 	    {
 	      i32 ttl1 = ip1->ttl;
 
@@ -2496,7 +2496,7 @@
 	    }
 	  else
 	    {
-	      p1->flags &= ~VNET_BUFFER_LOCALLY_ORIGINATED;
+	      p1->flags &= ~VNET_BUFFER_F_LOCALLY_ORIGINATED;
 	    }
 
 	  /* Rewrite packet header and updates lengths. */
@@ -2614,7 +2614,7 @@
 	  next0 = IP4_REWRITE_NEXT_DROP;	/* drop on error */
 
 	  /* Decrement TTL & update checksum. */
-	  if (PREDICT_TRUE (!(p0->flags & VNET_BUFFER_LOCALLY_ORIGINATED)))
+	  if (PREDICT_TRUE (!(p0->flags & VNET_BUFFER_F_LOCALLY_ORIGINATED)))
 	    {
 	      i32 ttl0 = ip0->ttl;
 
@@ -2648,7 +2648,7 @@
 	    }
 	  else
 	    {
-	      p0->flags &= ~VNET_BUFFER_LOCALLY_ORIGINATED;
+	      p0->flags &= ~VNET_BUFFER_F_LOCALLY_ORIGINATED;
 	    }
 
 	  if (do_counters)