X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fllc%2Fnode.c;h=79d15418af2bef3c24cc6b2772063b4f8beb8269;hb=f15a5791ba870a98a2ab7dec101bbbb9b6e266c1;hp=60b5c13420c4460627c96dd34331e4753b963622;hpb=7cd468a3d7dee7d6c92f69a0bb7061ae208ec727;p=vpp.git

diff --git a/src/vnet/llc/node.c b/src/vnet/llc/node.c
index 60b5c13420c..79d15418af2 100644
--- a/src/vnet/llc/node.c
+++ b/src/vnet/llc/node.c
@@ -38,7 +38,6 @@
  */
 
 #include <vlib/vlib.h>
-#include <vnet/pg/pg.h>
 #include <vnet/llc/llc.h>
 
 #define foreach_llc_input_next			\
@@ -128,17 +127,14 @@ llc_input (vlib_main_t * vm,
 	  b0 = vlib_get_buffer (vm, bi0);
 	  b1 = vlib_get_buffer (vm, bi1);
 
-	  h0 = (void *) (b0->data + b0->current_data);
-	  h1 = (void *) (b1->data + b1->current_data);
+	  h0 = vlib_buffer_get_current (b0);
+	  h1 = vlib_buffer_get_current (b1);
 
 	  len0 = llc_header_length (h0);
 	  len1 = llc_header_length (h1);
 
-	  b0->current_data += len0;
-	  b1->current_data += len1;
-
-	  b0->current_length -= len0;
-	  b1->current_length -= len1;
+	  vlib_buffer_advance (b0, len0);
+	  vlib_buffer_advance (b1, len1);
 
 	  next0 = lm->input_next_by_protocol[h0->dst_sap];
 	  next1 = lm->input_next_by_protocol[h1->dst_sap];
@@ -207,13 +203,11 @@ llc_input (vlib_main_t * vm,
 
 	  b0 = vlib_get_buffer (vm, bi0);
 
-	  h0 = (void *) (b0->data + b0->current_data);
+	  h0 = vlib_buffer_get_current (b0);
 
 	  len0 = llc_header_length (h0);
 
-	  b0->current_data += len0;
-
-	  b0->current_length -= len0;
+	  vlib_buffer_advance (b0, len0);
 
 	  next0 = lm->input_next_by_protocol[h0->dst_sap];