1 files changed, 77 insertions, 58 deletions

diff --git a/vnet/vnet/devices/af_packet/device.c b/vnet/vnet/devices/af_packet/device.c
index f572632ce37..1a46caa7810 100644
--- a/vnet/vnet/devices/af_packet/device.c
+++ b/vnet/vnet/devices/af_packet/device.c
@@ -32,37 +32,41 @@ _(TXRING_EAGAIN,   "tx sendto temporary failure")     \
 _(TXRING_FATAL,    "tx sendto fatal failure")         \
 _(TXRING_OVERRUN,  "tx ring overrun")
 
-typedef enum {
+typedef enum
+{
 #define _(f,s) AF_PACKET_TX_ERROR_##f,
   foreach_af_packet_tx_func_error
 #undef _
-  AF_PACKET_TX_N_ERROR,
+    AF_PACKET_TX_N_ERROR,
 } af_packet_tx_func_error_t;
 
-static char * af_packet_tx_func_error_strings[] = {
+static char *af_packet_tx_func_error_strings[] = {
 #define _(n,s) s,
-    foreach_af_packet_tx_func_error
+  foreach_af_packet_tx_func_error
 #undef _
 };
 
 
-static u8 * format_af_packet_device_name (u8 * s, va_list * args)
+static u8 *
+format_af_packet_device_name (u8 * s, va_list * args)
 {
   u32 i = va_arg (*args, u32);
-  af_packet_main_t * apm = &af_packet_main;
-  af_packet_if_t * apif = pool_elt_at_index (apm->interfaces, i);
+  af_packet_main_t *apm = &af_packet_main;
+  af_packet_if_t *apif = pool_elt_at_index (apm->interfaces, i);
 
   s = format (s, "host-%s", apif->host_if_name);
   return s;
 }
 
-static u8 * format_af_packet_device (u8 * s, va_list * args)
+static u8 *
+format_af_packet_device (u8 * s, va_list * args)
 {
   s = format (s, "Linux PACKET socket interface");
   return s;
 }
 
-static u8 * format_af_packet_tx_trace (u8 * s, va_list * args)
+static u8 *
+format_af_packet_tx_trace (u8 * s, va_list * args)
 {
   s = format (s, "Unimplemented...");
   return s;
@@ -70,36 +74,37 @@ static u8 * format_af_packet_tx_trace (u8 * s, va_list * args)
 
 static uword
 af_packet_interface_tx (vlib_main_t * vm,
-		       vlib_node_runtime_t * node,
-		       vlib_frame_t * frame)
+			vlib_node_runtime_t * node, vlib_frame_t * frame)
 {
-  af_packet_main_t * apm = &af_packet_main;
-  u32 * buffers = vlib_frame_args (frame);
+  af_packet_main_t *apm = &af_packet_main;
+  u32 *buffers = vlib_frame_args (frame);
   u32 n_left = frame->n_vectors;
   u32 n_sent = 0;
-  vnet_interface_output_runtime_t * rd = (void *) node->runtime_data;
-  af_packet_if_t * apif = pool_elt_at_index (apm->interfaces, rd->dev_instance);
+  vnet_interface_output_runtime_t *rd = (void *) node->runtime_data;
+  af_packet_if_t *apif =
+    pool_elt_at_index (apm->interfaces, rd->dev_instance);
   int block = 0;
   u32 block_size = apif->tx_req->tp_block_size;
   u32 frame_size = apif->tx_req->tp_frame_size;
   u32 frame_num = apif->tx_req->tp_frame_nr;
-  u8 * block_start = apif->tx_ring + block * block_size;
+  u8 *block_start = apif->tx_ring + block * block_size;
   u32 tx_frame = apif->next_tx_frame;
-  struct tpacket2_hdr * tph;
+  struct tpacket2_hdr *tph;
   u32 frame_not_ready = 0;
 
-  while(n_left > 0)
+  while (n_left > 0)
     {
       u32 len;
       u32 offset = 0;
-      vlib_buffer_t * b0;
+      vlib_buffer_t *b0;
       n_left--;
       u32 bi = buffers[0];
       buffers++;
 
       tph = (struct tpacket2_hdr *) (block_start + tx_frame * frame_size);
 
-      if (PREDICT_FALSE(tph->tp_status & (TP_STATUS_SEND_REQUEST | TP_STATUS_SENDING)))
+      if (PREDICT_FALSE
+	  (tph->tp_status & (TP_STATUS_SEND_REQUEST | TP_STATUS_SENDING)))
 	{
 	  frame_not_ready++;
 	  goto next;
@@ -109,8 +114,9 @@ af_packet_interface_tx (vlib_main_t * vm,
 	{
 	  b0 = vlib_get_buffer (vm, bi);
 	  len = b0->current_length;
-	  clib_memcpy((u8 *) tph + TPACKET_ALIGN(sizeof(struct tpacket2_hdr)) + offset,
-		 vlib_buffer_get_current(b0), len);
+	  clib_memcpy ((u8 *) tph +
+		       TPACKET_ALIGN (sizeof (struct tpacket2_hdr)) + offset,
+		       vlib_buffer_get_current (b0), len);
 	  offset += len;
 	}
       while ((bi = b0->next_buffer));
@@ -118,54 +124,54 @@ af_packet_interface_tx (vlib_main_t * vm,
       tph->tp_len = tph->tp_snaplen = offset;
       tph->tp_status = TP_STATUS_SEND_REQUEST;
       n_sent++;
-next:
+    next:
       /* check if we've exhausted the ring */
-      if (PREDICT_FALSE(frame_not_ready + n_sent == frame_num))
-        break;
+      if (PREDICT_FALSE (frame_not_ready + n_sent == frame_num))
+	break;
 
       tx_frame = (tx_frame + 1) % frame_num;
     }
 
-  CLIB_MEMORY_BARRIER();
+  CLIB_MEMORY_BARRIER ();
 
-  if (PREDICT_TRUE(n_sent))
+  if (PREDICT_TRUE (n_sent))
     {
       apif->next_tx_frame = tx_frame;
 
-      if (PREDICT_FALSE(sendto(apif->fd, NULL, 0,
-                               MSG_DONTWAIT, NULL, 0) == -1))
-        {
-          /* Uh-oh, drop & move on, but count whether it was fatal or not.
-           * Note that we have no reliable way to properly determine the
-           * disposition of the packets we just enqueued for delivery.
-           */
-          vlib_error_count (vm, node->node_index,
-                            unix_error_is_fatal(errno) ?
-                            AF_PACKET_TX_ERROR_TXRING_FATAL :
-                            AF_PACKET_TX_ERROR_TXRING_EAGAIN,
-                            n_sent);
-        }
+      if (PREDICT_FALSE (sendto (apif->fd, NULL, 0,
+				 MSG_DONTWAIT, NULL, 0) == -1))
+	{
+	  /* Uh-oh, drop & move on, but count whether it was fatal or not.
+	   * Note that we have no reliable way to properly determine the
+	   * disposition of the packets we just enqueued for delivery.
+	   */
+	  vlib_error_count (vm, node->node_index,
+			    unix_error_is_fatal (errno) ?
+			    AF_PACKET_TX_ERROR_TXRING_FATAL :
+			    AF_PACKET_TX_ERROR_TXRING_EAGAIN, n_sent);
+	}
     }
 
-  if (PREDICT_FALSE(frame_not_ready))
-    vlib_error_count (vm, node->node_index, AF_PACKET_TX_ERROR_FRAME_NOT_READY,
-                      frame_not_ready);
+  if (PREDICT_FALSE (frame_not_ready))
+    vlib_error_count (vm, node->node_index,
+		      AF_PACKET_TX_ERROR_FRAME_NOT_READY, frame_not_ready);
 
-  if (PREDICT_FALSE(frame_not_ready + n_sent == frame_num))
+  if (PREDICT_FALSE (frame_not_ready + n_sent == frame_num))
     vlib_error_count (vm, node->node_index, AF_PACKET_TX_ERROR_TXRING_OVERRUN,
-                      n_left);
+		      n_left);
 
   vlib_buffer_free (vm, vlib_frame_args (frame), frame->n_vectors);
   return frame->n_vectors;
 }
 
 static void
-af_packet_set_interface_next_node (vnet_main_t *vnm, u32 hw_if_index,
-				  u32 node_index)
+af_packet_set_interface_next_node (vnet_main_t * vnm, u32 hw_if_index,
+				   u32 node_index)
 {
-  af_packet_main_t * apm = &af_packet_main;
+  af_packet_main_t *apm = &af_packet_main;
   vnet_hw_interface_t *hw = vnet_get_hw_interface (vnm, hw_if_index);
-  af_packet_if_t * apif = pool_elt_at_index (apm->interfaces, hw->dev_instance);
+  af_packet_if_t *apif =
+    pool_elt_at_index (apm->interfaces, hw->dev_instance);
 
   /* Shut off redirection */
   if (node_index == ~0)
@@ -175,20 +181,24 @@ af_packet_set_interface_next_node (vnet_main_t *vnm, u32 hw_if_index,
     }
 
   apif->per_interface_next_index =
-    vlib_node_add_next (vlib_get_main(), af_packet_input_node.index, node_index);
+    vlib_node_add_next (vlib_get_main (), af_packet_input_node.index,
+			node_index);
 }
 
-static void af_packet_clear_hw_interface_counters (u32 instance)
+static void
+af_packet_clear_hw_interface_counters (u32 instance)
 {
   /* Nothing for now */
 }
 
 static clib_error_t *
-af_packet_interface_admin_up_down (vnet_main_t * vnm, u32 hw_if_index, u32 flags)
+af_packet_interface_admin_up_down (vnet_main_t * vnm, u32 hw_if_index,
+				   u32 flags)
 {
-  af_packet_main_t * apm = &af_packet_main;
+  af_packet_main_t *apm = &af_packet_main;
   vnet_hw_interface_t *hw = vnet_get_hw_interface (vnm, hw_if_index);
-  af_packet_if_t * apif = pool_elt_at_index (apm->interfaces, hw->dev_instance);
+  af_packet_if_t *apif =
+    pool_elt_at_index (apm->interfaces, hw->dev_instance);
   u32 hw_flags;
 
   apif->is_admin_up = (flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) != 0;
@@ -198,21 +208,21 @@ af_packet_interface_admin_up_down (vnet_main_t * vnm, u32 hw_if_index, u32 flags
   else
     hw_flags = 0;
 
-  vnet_hw_interface_set_flags(vnm, hw_if_index, hw_flags);
+  vnet_hw_interface_set_flags (vnm, hw_if_index, hw_flags);
 
   return 0;
 }
 
 static clib_error_t *
 af_packet_subif_add_del_function (vnet_main_t * vnm,
-				 u32 hw_if_index,
-				 struct vnet_sw_interface_t * st,
-				 int is_add)
+				  u32 hw_if_index,
+				  struct vnet_sw_interface_t *st, int is_add)
 {
   /* Nothing for now */
   return 0;
 }
 
+/* *INDENT-OFF* */
 VNET_DEVICE_CLASS (af_packet_device_class) = {
   .name = "af-packet",
   .tx_function = af_packet_interface_tx,
@@ -230,3 +240,12 @@ VNET_DEVICE_CLASS (af_packet_device_class) = {
 
 VLIB_DEVICE_TX_FUNCTION_MULTIARCH (af_packet_device_class,
 				   af_packet_interface_tx)
+/* *INDENT-ON* */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */