octeon: native driver for Marvell Octeon SoC

[vpp.git] / src / plugins / lacp / node.h

diff --git a/src/plugins/lacp/node.h b/src/plugins/lacp/node.h
index 88bc587..165131a 100644 (file)
--- a/src/plugins/lacp/node.h
+++ b/src/plugins/lacp/node.h
@@ -37,7 +37,7 @@ typedef enum
   MARKER_N_PACKET_TEMPLATES,
 } marker_packet_template_id_t;
 
-enum
+typedef enum
 {
   LACP_PROCESS_EVENT_START = 1,
   LACP_PROCESS_EVENT_STOP = 2,
@@ -58,13 +58,15 @@ enum
   }
 
 /* Packet counters */
-#define foreach_lacp_error                                               \
-_ (NONE, "good lacp packets -- consumed")                               \
-_ (CACHE_HIT, "good lacp packets -- cache hit")                          \
-_ (UNSUPPORTED, "unsupported slow protocol packets")                     \
-_ (TOO_SMALL, "bad lacp packets -- packet too small")                    \
-_ (BAD_TLV, "bad lacp packets -- bad TLV length")                        \
-_ (DISABLED, "lacp packets received on disabled interfaces")
+#define foreach_lacp_error                                                    \
+  _ (NONE, "good lacp packets -- consumed")                                   \
+  _ (CACHE_HIT, "good lacp packets -- cache hit")                             \
+  _ (UNSUPPORTED, "unsupported slow protocol packets")                        \
+  _ (TOO_SMALL, "bad lacp packets -- packet too small")                       \
+  _ (BAD_TLV, "bad lacp packets -- bad TLV length")                           \
+  _ (BAD_KEY, "Bad key")                                                      \
+  _ (LOOPBACK_PORT, "loopback port")                                          \
+  _ (DISABLED, "lacp packets received on disabled interfaces")
 
 typedef enum
 {
@@ -146,15 +148,15 @@ int lacp_dump_ifs (lacp_interface_details_t ** out_bondids);
 lacp_error_t lacp_input (vlib_main_t * vm, vlib_buffer_t * b0, u32 bi0);
 void lacp_periodic (vlib_main_t * vm);
 u8 *lacp_input_format_trace (u8 * s, va_list * args);
-void lacp_init_neighbor (slave_if_t * sif, u8 * hw_address,
+void lacp_init_neighbor (member_if_t * mif, u8 * hw_address,
                         u16 port_number, u32 group);
-void lacp_init_state_machines (vlib_main_t * vm, slave_if_t * sif);
-void lacp_init_rx_machine (vlib_main_t * vm, slave_if_t * sif);
-void lacp_init_tx_machine (vlib_main_t * vm, slave_if_t * sif);
-void lacp_init_ptx_machine (vlib_main_t * vm, slave_if_t * sif);
-void lacp_init_mux_machine (vlib_main_t * vm, slave_if_t * sif);
-void lacp_selection_logic (vlib_main_t * vm, slave_if_t * sif);
-void lacp_send_lacp_pdu (vlib_main_t * vm, slave_if_t * sif);
+void lacp_init_state_machines (vlib_main_t * vm, member_if_t * mif);
+void lacp_init_rx_machine (vlib_main_t * vm, member_if_t * mif);
+void lacp_init_tx_machine (vlib_main_t * vm, member_if_t * mif);
+void lacp_init_ptx_machine (vlib_main_t * vm, member_if_t * mif);
+void lacp_init_mux_machine (vlib_main_t * vm, member_if_t * mif);
+int lacp_selection_logic (vlib_main_t *vm, member_if_t *mif);
+void lacp_send_lacp_pdu (vlib_main_t * vm, member_if_t * mif);
 
 static inline void
 lacp_stop_timer (f64 * timer)
@@ -186,8 +188,7 @@ format_rx_sm_state (u8 * s, va_list * args)
     {.str = NULL}
   };
   int state = va_arg (*args, int);
-  lacp_state_struct *state_entry =
-    (lacp_state_struct *) & lacp_rx_sm_state_array;
+  lacp_state_struct *state_entry = lacp_rx_sm_state_array;
 
   if (state >= (sizeof (lacp_rx_sm_state_array) / sizeof (*state_entry)))
     s = format (s, "Bad state %d", state);
@@ -207,8 +208,7 @@ format_tx_sm_state (u8 * s, va_list * args)
     {.str = NULL}
   };
   int state = va_arg (*args, int);
-  lacp_state_struct *state_entry =
-    (lacp_state_struct *) & lacp_tx_sm_state_array;
+  lacp_state_struct *state_entry = lacp_tx_sm_state_array;
 
   if (state >= (sizeof (lacp_tx_sm_state_array) / sizeof (*state_entry)))
     s = format (s, "Bad state %d", state);
@@ -228,8 +228,7 @@ format_mux_sm_state (u8 * s, va_list * args)
     {.str = NULL}
   };
   int state = va_arg (*args, int);
-  lacp_state_struct *state_entry =
-    (lacp_state_struct *) & lacp_mux_sm_state_array;
+  lacp_state_struct *state_entry = lacp_mux_sm_state_array;
 
   if (state >= (sizeof (lacp_mux_sm_state_array) / sizeof (*state_entry)))
     s = format (s, "Bad state %d", state);
@@ -249,8 +248,7 @@ format_ptx_sm_state (u8 * s, va_list * args)
     {.str = NULL}
   };
   int state = va_arg (*args, int);
-  lacp_state_struct *state_entry =
-    (lacp_state_struct *) & lacp_ptx_sm_state_array;
+  lacp_state_struct *state_entry = lacp_ptx_sm_state_array;
 
   if (state >= (sizeof (lacp_ptx_sm_state_array) / sizeof (*state_entry)))
     s = format (s, "Bad state %d", state);