X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=vnet%2Fvnet%2Fethernet%2Fpg.c;fp=vnet%2Fvnet%2Fethernet%2Fpg.c;h=67ccfcf5fbeff0b1759c81d224c508a235257d23;hb=e70dcc8676b6b2db74989e43f116bbb200239bf8;hp=838688db4519f2a73b3f3551518145640ef04c04;hpb=81b52c5506ad3ded98dc82fbe4603eec7ad72b8a;p=vpp.git

diff --git a/vnet/vnet/ethernet/pg.c b/vnet/vnet/ethernet/pg.c
index 838688db451..67ccfcf5fbe 100644
--- a/vnet/vnet/ethernet/pg.c
+++ b/vnet/vnet/ethernet/pg.c
@@ -41,7 +41,8 @@
 #include <vnet/pg/pg.h>
 #include <vnet/ethernet/ethernet.h>
 
-typedef struct {
+typedef struct
+{
   pg_edit_t type;
   pg_edit_t src_address;
   pg_edit_t dst_address;
@@ -55,7 +56,8 @@ pg_ethernet_header_init (pg_ethernet_header_t * e)
   pg_edit_init (&e->dst_address, ethernet_header_t, dst_address);
 }
 
-typedef struct {
+typedef struct
+{
   pg_edit_t type;
   pg_edit_t id;
   pg_edit_t cfi;
@@ -63,44 +65,40 @@ typedef struct {
 } pg_ethernet_vlan_header_t;
 
 static inline void
-pg_ethernet_vlan_header_init (pg_ethernet_vlan_header_t * v,
-			      int vlan_index)
+pg_ethernet_vlan_header_init (pg_ethernet_vlan_header_t * v, int vlan_index)
 {
   ASSERT (vlan_index < ARRAY_LEN (((ethernet_max_header_t *) 0)->vlan));
   pg_edit_init (&v->type, ethernet_max_header_t, vlan[vlan_index].type);
 
   pg_edit_init_bitfield (&v->id, ethernet_max_header_t,
-			 vlan[vlan_index].priority_cfi_and_id,
-			 0, 12);
+			 vlan[vlan_index].priority_cfi_and_id, 0, 12);
   pg_edit_init_bitfield (&v->cfi, ethernet_max_header_t,
-			 vlan[vlan_index].priority_cfi_and_id,
-			 12, 1);
+			 vlan[vlan_index].priority_cfi_and_id, 12, 1);
   pg_edit_init_bitfield (&v->priority, ethernet_max_header_t,
-			 vlan[vlan_index].priority_cfi_and_id,
-			 13, 3);
+			 vlan[vlan_index].priority_cfi_and_id, 13, 3);
 }
 
 uword
 unformat_pg_ethernet_header (unformat_input_t * input, va_list * args)
 {
-  pg_stream_t * s = va_arg (*args, pg_stream_t *);
-  pg_ethernet_header_t * e;
-  pg_ethernet_vlan_header_t * v;
-  pg_edit_t * ether_type_edit;
+  pg_stream_t *s = va_arg (*args, pg_stream_t *);
+  pg_ethernet_header_t *e;
+  pg_ethernet_vlan_header_t *v;
+  pg_edit_t *ether_type_edit;
   u32 n_vlan, error, group_index;
-  
+
   e = pg_create_edit_group (s, sizeof (e[0]), sizeof (ethernet_header_t),
 			    &group_index);
   pg_ethernet_header_init (e);
   error = 1;
 
-  if (! unformat (input, "%U: %U -> %U",
-		  unformat_pg_edit,
-		    unformat_ethernet_type_net_byte_order, &e->type,
-		  unformat_pg_edit,
-		    unformat_ethernet_address, &e->src_address,
-		  unformat_pg_edit,
-		    unformat_ethernet_address, &e->dst_address))
+  if (!unformat (input, "%U: %U -> %U",
+		 unformat_pg_edit,
+		 unformat_ethernet_type_net_byte_order, &e->type,
+		 unformat_pg_edit,
+		 unformat_ethernet_address, &e->src_address,
+		 unformat_pg_edit,
+		 unformat_ethernet_address, &e->dst_address))
     goto done;
 
   n_vlan = 0;
@@ -110,16 +108,16 @@ unformat_pg_ethernet_header (unformat_input_t * input, va_list * args)
 			group_index);
       pg_ethernet_vlan_header_init (v, n_vlan);
 
-      if (! unformat_user (input, unformat_pg_edit,
-			   unformat_pg_number, &v->id))
+      if (!unformat_user (input, unformat_pg_edit,
+			  unformat_pg_number, &v->id))
 	goto done;
 
-      if (! unformat (input, "priority %U", unformat_pg_edit,
-		      unformat_pg_number, &v->priority))
+      if (!unformat (input, "priority %U", unformat_pg_edit,
+		     unformat_pg_number, &v->priority))
 	pg_edit_set_fixed (&v->priority, 0);
 
-      if (! unformat (input, "cfi %U", unformat_pg_edit,
-		      unformat_pg_number, &v->cfi))
+      if (!unformat (input, "cfi %U", unformat_pg_edit,
+		     unformat_pg_number, &v->cfi))
 	pg_edit_set_fixed (&v->cfi, 0);
 
       /* Too many vlans given. */
@@ -148,9 +146,9 @@ unformat_pg_ethernet_header (unformat_input_t * input, va_list * args)
     }
 
   {
-    ethernet_main_t * em = &ethernet_main;
-    ethernet_type_info_t * ti = 0;
-    pg_node_t * pg_node = 0;
+    ethernet_main_t *em = &ethernet_main;
+    ethernet_type_info_t *ti = 0;
+    pg_node_t *pg_node = 0;
 
     if (ether_type_edit->type == PG_EDIT_FIXED)
       {
@@ -163,15 +161,23 @@ unformat_pg_ethernet_header (unformat_input_t * input, va_list * args)
     if (pg_node && pg_node->unformat_edit
 	&& unformat_user (input, pg_node->unformat_edit, s))
       ;
-    else if (! unformat_user (input, unformat_pg_payload, s))
+    else if (!unformat_user (input, unformat_pg_payload, s))
       goto done;
   }
 
   error = 0;
 
- done:
+done:
   if (error)
     pg_free_edit_group (s);
   return error == 0;
 }
 
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */