X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fgre%2Fgre.c;h=449968c1be0ef1f540f4ff4edcbca7523f29dead;hb=b7b929931a07fbb27b43d5cd105f366c3e29807e;hp=0b8d2cc8df7ae67d2a4bf46a01587ca9dc1d14d1;hpb=756cd9441752fc8f84104c9ee19099506ba89f85;p=vpp.git

diff --git a/src/vnet/gre/gre.c b/src/vnet/gre/gre.c
index 0b8d2cc8df7..449968c1be0 100644
--- a/src/vnet/gre/gre.c
+++ b/src/vnet/gre/gre.c
@@ -292,8 +292,8 @@ gre6_fixup (vlib_main_t * vm,
   /* Fixup the payload length field in the GRE tunnel encap that was applied
    * at the midchain node */
   ip0->payload_length =
-    clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b0))
-    - sizeof (*ip0);
+    clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b0) -
+			  sizeof (*ip0));
 }
 
 void
@@ -406,7 +406,7 @@ gre_interface_tx (vlib_main_t * vm,
 	      /* Encap GRE seq# and ERSPAN type II header */
 	      vlib_buffer_advance (b0, -sizeof (erspan_t2_t));
 	      erspan_t2_t *h0 = vlib_buffer_get_current (b0);
-	      u32 seq_num = clib_smp_atomic_add (&gt0->gre_sn->seq_num, 1);
+	      u32 seq_num = clib_atomic_fetch_add (&gt0->gre_sn->seq_num, 1);
 	      u64 hdr = clib_host_to_net_u64 (ERSPAN_HDR2);
 	      h0->seq_num = clib_host_to_net_u32 (seq_num);
 	      h0->t2_u64 = hdr;
@@ -418,7 +418,7 @@ gre_interface_tx (vlib_main_t * vm,
 	      /* Encap GRE seq# and ERSPAN type II header */
 	      vlib_buffer_advance (b1, -sizeof (erspan_t2_t));
 	      erspan_t2_t *h1 = vlib_buffer_get_current (b1);
-	      u32 seq_num = clib_smp_atomic_add (&gt1->gre_sn->seq_num, 1);
+	      u32 seq_num = clib_atomic_fetch_add (&gt1->gre_sn->seq_num, 1);
 	      u64 hdr = clib_host_to_net_u64 (ERSPAN_HDR2);
 	      h1->seq_num = clib_host_to_net_u32 (seq_num);
 	      h1->t2_u64 = hdr;
@@ -473,7 +473,7 @@ gre_interface_tx (vlib_main_t * vm,
 	      /* Encap GRE seq# and ERSPAN type II header */
 	      vlib_buffer_advance (b0, -sizeof (erspan_t2_t));
 	      erspan_t2_t *h0 = vlib_buffer_get_current (b0);
-	      u32 seq_num = clib_smp_atomic_add (&gt0->gre_sn->seq_num, 1);
+	      u32 seq_num = clib_atomic_fetch_add (&gt0->gre_sn->seq_num, 1);
 	      u64 hdr = clib_host_to_net_u64 (ERSPAN_HDR2);
 	      h0->seq_num = clib_host_to_net_u32 (seq_num);
 	      h0->t2_u64 = hdr;
@@ -597,7 +597,7 @@ gre_init (vlib_main_t * vm)
   ip_main_t *im = &ip_main;
   ip_protocol_info_t *pi;
 
-  memset (gm, 0, sizeof (gm[0]));
+  clib_memset (gm, 0, sizeof (gm[0]));
   gm->vlib_main = vm;
   gm->vnet_main = vnet_get_main ();