1 files changed, 42 insertions, 30 deletions

diff --git a/vnet/vnet/l2tp/pg.c b/vnet/vnet/l2tp/pg.c
index 394e14681b1..1e523d3bbb0 100644
--- a/vnet/vnet/l2tp/pg.c
+++ b/vnet/vnet/l2tp/pg.c
@@ -19,12 +19,14 @@
 #include <vnet/pg/pg.h>
 #include <vnet/l2tp/l2tp.h>
 
-typedef struct {
+typedef struct
+{
   pg_edit_t session_id;
   pg_edit_t cookie;
 } pg_l2tp_header_t;
 
-typedef struct {
+typedef struct
+{
   pg_edit_t l2_sublayer;
 } pg_l2tp_header_l2_sublayer_t;
 
@@ -38,49 +40,52 @@ pg_l2tp_header_init (pg_l2tp_header_t * e)
 uword
 unformat_pg_l2tp_header (unformat_input_t * input, va_list * args)
 {
-  pg_stream_t * s = va_arg (*args, pg_stream_t *);
-  pg_l2tp_header_t * h;
+  pg_stream_t *s = va_arg (*args, pg_stream_t *);
+  pg_l2tp_header_t *h;
   u32 group_index, error;
-  vlib_main_t * vm = vlib_get_main();
+  vlib_main_t *vm = vlib_get_main ();
 
-  h = pg_create_edit_group (s, sizeof (h[0]), 
-                            sizeof (l2tpv3_header_t) - sizeof(u32),
+  h = pg_create_edit_group (s, sizeof (h[0]),
+			    sizeof (l2tpv3_header_t) - sizeof (u32),
 			    &group_index);
   pg_l2tp_header_init (h);
 
   error = 1;
 
-  // session id and cookie are required
-  if (! unformat (input, "L2TP: session_id %U cookie %U",
-                  unformat_pg_edit, unformat_pg_number, &h->session_id,
-                  unformat_pg_edit, unformat_pg_number, &h->cookie)) {
-    goto done;
-  }
-
-  // "l2_sublayer <value>" is optional
-  if (unformat (input, "l2_sublayer")) {
-    pg_l2tp_header_l2_sublayer_t * h2;
-
-    h2 = pg_add_edits (s, sizeof (h2[0]), sizeof(u32), group_index);
-    pg_edit_init (&h2->l2_sublayer, l2tpv3_header_t, l2_specific_sublayer);
-    if (! unformat_user (input, unformat_pg_edit,
-			 unformat_pg_number, &h2->l2_sublayer)) {
+  /* session id and cookie are required */
+  if (!unformat (input, "L2TP: session_id %U cookie %U",
+		 unformat_pg_edit, unformat_pg_number, &h->session_id,
+		 unformat_pg_edit, unformat_pg_number, &h->cookie))
+    {
       goto done;
-    } 
-  }
-
-  // Parse an ethernet header if it is present
+    }
+
+  /* "l2_sublayer <value>" is optional */
+  if (unformat (input, "l2_sublayer"))
+    {
+      pg_l2tp_header_l2_sublayer_t *h2;
+
+      h2 = pg_add_edits (s, sizeof (h2[0]), sizeof (u32), group_index);
+      pg_edit_init (&h2->l2_sublayer, l2tpv3_header_t, l2_specific_sublayer);
+      if (!unformat_user (input, unformat_pg_edit,
+			  unformat_pg_number, &h2->l2_sublayer))
+	{
+	  goto done;
+	}
+    }
+
+  /* Parse an ethernet header if it is present */
   {
-    pg_node_t * pg_node = 0;
-    vlib_node_t * eth_lookup_node;
+    pg_node_t *pg_node = 0;
+    vlib_node_t *eth_lookup_node;
 
-    eth_lookup_node = vlib_get_node_by_name (vm, (u8 *)"ethernet-input");
+    eth_lookup_node = vlib_get_node_by_name (vm, (u8 *) "ethernet-input");
     ASSERT (eth_lookup_node);
 
     pg_node = pg_get_node (eth_lookup_node->index);
 
     if (pg_node && pg_node->unformat_edit
-        && unformat_user (input, pg_node->unformat_edit, s))
+	&& unformat_user (input, pg_node->unformat_edit, s))
       ;
   }
 
@@ -92,3 +97,10 @@ done:
   return error == 0;
 }
 
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */