misc: add code styling for vxlan encap and vxlan_packet files

Type: style

Change-Id: Id363ccd0e51c61388fb45ef10685929f629cccbd
Signed-off-by: Mohsin Kazmi <sykazmi@cisco.com>

src/vnet/vxlan/encap.c

@@ -32,30 +32,33 @@ static char * vxlan_encap_error_strings[] = {
 #undef _
 };
 
-typedef enum {
+typedef enum
+{
 #define _(sym,str) VXLAN_ENCAP_ERROR_##sym,
   foreach_vxlan_encap_error
 #undef _
     VXLAN_ENCAP_N_ERROR,
 } vxlan_encap_error_t;
 
-typedef enum {
+typedef enum
+{
   VXLAN_ENCAP_NEXT_DROP,
   VXLAN_ENCAP_N_NEXT,
 } vxlan_encap_next_t;
 
-typedef struct {
+typedef struct
+{
   u32 tunnel_index;
   u32 vni;
 } vxlan_encap_trace_t;
 
 #ifndef CLIB_MARCH_VARIANT
-u8 * format_vxlan_encap_trace (u8 * s, va_list * args)
+u8 *
+format_vxlan_encap_trace (u8 * s, va_list * args)
 {
   CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
   CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  vxlan_encap_trace_t * t 
+  vxlan_encap_trace_t *t = va_arg (*args, vxlan_encap_trace_t *);
-      = va_arg (*args, vxlan_encap_trace_t *);
 
   s = format (s, "VXLAN encap to vxlan_tunnel%d vni %d",
 	      t->tunnel_index, t->vni);
@@ -66,8 +69,7 @@ u8 * format_vxlan_encap_trace (u8 * s, va_list * args)
 always_inline uword
 vxlan_encap_inline (vlib_main_t * vm,
 		    vlib_node_runtime_t * node,
-		    vlib_frame_t * from_frame,
+		    vlib_frame_t * from_frame, u8 is_ip4, u8 csum_offload)
-		    u8 is_ip4, u8 csum_offload)
 {
   u32 n_left_from, next_index, *from, *to_next;
   vxlan_main_t *vxm = &vxlan_main;
@@ -104,8 +106,7 @@ vxlan_encap_inline (vlib_main_t * vm,
     {
       u32 n_left_to_next;
 
-      vlib_get_next_frame (vm, node, next_index,
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-			   to_next, n_left_to_next);
 
       while (n_left_from >= 4 && n_left_to_next >= 2)
 	{
@@ -114,8 +115,10 @@ vxlan_encap_inline (vlib_main_t * vm,
 	    vlib_prefetch_buffer_header (b[2], LOAD);
 	    vlib_prefetch_buffer_header (b[3], LOAD);
 
-	    CLIB_PREFETCH (b[2]->data - CLIB_CACHE_LINE_BYTES, 2 * CLIB_CACHE_LINE_BYTES, LOAD);
+	    CLIB_PREFETCH (b[2]->data - CLIB_CACHE_LINE_BYTES,
-	    CLIB_PREFETCH (b[3]->data - CLIB_CACHE_LINE_BYTES, 2 * CLIB_CACHE_LINE_BYTES, LOAD);
+			   2 * CLIB_CACHE_LINE_BYTES, LOAD);
+	    CLIB_PREFETCH (b[3]->data - CLIB_CACHE_LINE_BYTES,
+			   2 * CLIB_CACHE_LINE_BYTES, LOAD);
 	  }
 
 	  u32 bi0 = to_next[0] = from[0];
@@ -171,7 +174,9 @@ vxlan_encap_inline (vlib_main_t * vm,
 
 	  ASSERT (t0->rewrite_header.data_bytes == underlay_hdr_len);
 	  ASSERT (t1->rewrite_header.data_bytes == underlay_hdr_len);
-          vnet_rewrite_two_headers(*t0, *t1, vlib_buffer_get_current(b0), vlib_buffer_get_current(b1), underlay_hdr_len);
+	  vnet_rewrite_two_headers (*t0, *t1, vlib_buffer_get_current (b0),
+				    vlib_buffer_get_current (b1),
+				    underlay_hdr_len);
 
 	  vlib_buffer_advance (b0, -underlay_hdr_len);
 	  vlib_buffer_advance (b1, -underlay_hdr_len);
@@ -353,7 +358,8 @@ vxlan_encap_inline (vlib_main_t * vm,
 	  vnet_buffer (b0)->ip.adj_index[VLIB_TX] = dpoi_idx0;
 
 	  ASSERT (t0->rewrite_header.data_bytes == underlay_hdr_len);
-          vnet_rewrite_one_header(*t0, vlib_buffer_get_current(b0), underlay_hdr_len);
+	  vnet_rewrite_one_header (*t0, vlib_buffer_get_current (b0),
+				   underlay_hdr_len);
 
 	  vlib_buffer_advance (b0, -underlay_hdr_len);
 	  void *underlay0 = vlib_buffer_get_current (b0);
@@ -479,6 +485,7 @@ VLIB_NODE_FN (vxlan6_encap_node) (vlib_main_t * vm,
 			     /* csum_offload */ 1);
 }
 
+/* *INDENT-OFF* */
 VLIB_REGISTER_NODE (vxlan4_encap_node) = {
   .name = "vxlan4-encap",
   .vector_size = sizeof (u32),
@@ -504,4 +511,12 @@ VLIB_REGISTER_NODE (vxlan6_encap_node) = {
         [VXLAN_ENCAP_NEXT_DROP] = "error-drop",
   },
 };
+/* *INDENT-ON* */
 
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */

src/vnet/vxlan/vxlan_packet.h

@@ -41,7 +41,8 @@
  *
  */
 
-typedef struct {
+typedef struct
+{
   u8 flags;
   u8 res1;
   u8 res2;
@@ -51,7 +52,8 @@ typedef struct {
 
 #define VXLAN_FLAGS_I 0x08
 
-static inline u32 vnet_get_vni (vxlan_header_t * h)
+static inline u32
+vnet_get_vni (vxlan_header_t * h)
 {
   u32 vni_reserved_host_byte_order;
 
@@ -59,7 +61,8 @@ static inline u32 vnet_get_vni (vxlan_header_t * h)
   return vni_reserved_host_byte_order >> 8;
 }
 
-static inline void vnet_set_vni_and_flags (vxlan_header_t * h, u32 vni)
+static inline void
+vnet_set_vni_and_flags (vxlan_header_t * h, u32 vni)
 {
   h->vni_reserved = clib_host_to_net_u32 (vni << 8);
   *(u32 *) h = 0;
@@ -67,3 +70,11 @@ static inline void vnet_set_vni_and_flags (vxlan_header_t * h, u32 vni)
 }
 
 #endif /* __included_vxlan_packet_h__ */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */