X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fl2%2Fl2_efp_filter.c;h=3d152ad1f11d55f559a7962d4f395fd1d3012b95;hb=7adf5735ef4cc5656a71c97138c4fa35fb6cbeb9;hp=f10c5eaf7f90f1c5a854b4c99832a2eef21a2200;hpb=178cf493d009995b28fdf220f04c98860ff79a9b;p=vpp.git

diff --git a/src/vnet/l2/l2_efp_filter.c b/src/vnet/l2/l2_efp_filter.c
index f10c5eaf7f9..3d152ad1f11 100644
--- a/src/vnet/l2/l2_efp_filter.c
+++ b/src/vnet/l2/l2_efp_filter.c
@@ -22,6 +22,7 @@
 #include <vnet/l2/feat_bitmap.h>
 #include <vnet/l2/l2_output.h>
 #include <vnet/ethernet/ethernet.h>
+#include <vnet/l2/l2_efp_filter.h>
 
 #include <vppinfra/error.h>
 #include <vppinfra/cache.h>
@@ -80,9 +81,11 @@ format_l2_efp_filter_trace (u8 * s, va_list * args)
   return s;
 }
 
-l2_efp_filter_main_t l2_efp_filter_main;
+extern l2_efp_filter_main_t l2_efp_filter_main;
 
-static vlib_node_registration_t l2_efp_filter_node;
+#ifndef CLIB_MARCH_VARIANT
+l2_efp_filter_main_t l2_efp_filter_main;
+#endif /* CLIB_MARCH_VARIANT */
 
 #define foreach_l2_efp_filter_error			\
 _(L2_EFP_FILTER, "L2 EFP filter packets")		\
@@ -169,9 +172,9 @@ extract_keys (vnet_main_t * vnet_main,
  * The post-rewrite check is performed here.
  */
 
-static uword
-l2_efp_filter_node_fn (vlib_main_t * vm,
-		       vlib_node_runtime_t * node, vlib_frame_t * frame)
+VLIB_NODE_FN (l2_efp_filter_node) (vlib_main_t * vm,
+				   vlib_node_runtime_t * node,
+				   vlib_frame_t * frame)
 {
   u32 n_left_from, *from, *to_next;
   l2_efp_filter_next_t next_index;
@@ -301,7 +304,6 @@ l2_efp_filter_node_fn (vlib_main_t * vm,
 				  &main_intf1, &vlan_intf1, &qinq_intf1);
 
 	  matched0 = eth_identify_subint (hi0,
-					  b0,
 					  match_flags0,
 					  main_intf0,
 					  vlan_intf0,
@@ -310,7 +312,6 @@ l2_efp_filter_node_fn (vlib_main_t * vm,
 					  &error0, &is_l20);
 
 	  matched1 = eth_identify_subint (hi1,
-					  b1,
 					  match_flags1,
 					  main_intf1,
 					  vlan_intf1,
@@ -419,7 +420,6 @@ l2_efp_filter_node_fn (vlib_main_t * vm,
 				  &main_intf0, &vlan_intf0, &qinq_intf0);
 
 	  matched0 = eth_identify_subint (hi0,
-					  b0,
 					  match_flags0,
 					  main_intf0,
 					  vlan_intf0,
@@ -460,8 +460,7 @@ l2_efp_filter_node_fn (vlib_main_t * vm,
 
 
 /* *INDENT-OFF* */
-VLIB_REGISTER_NODE (l2_efp_filter_node,static) = {
-  .function = l2_efp_filter_node_fn,
+VLIB_REGISTER_NODE (l2_efp_filter_node) = {
   .name = "l2-efp-filter",
   .vector_size = sizeof (u32),
   .format_trace = format_l2_efp_filter_trace,
@@ -479,8 +478,9 @@ VLIB_REGISTER_NODE (l2_efp_filter_node,static) = {
 };
 /* *INDENT-ON* */
 
-VLIB_NODE_FUNCTION_MULTIARCH (l2_efp_filter_node, l2_efp_filter_node_fn)
-     clib_error_t *l2_efp_filter_init (vlib_main_t * vm)
+#ifndef CLIB_MARCH_VARIANT
+clib_error_t *
+l2_efp_filter_init (vlib_main_t * vm)
 {
   l2_efp_filter_main_t *mp = &l2_efp_filter_main;
 
@@ -565,6 +565,7 @@ VLIB_CLI_COMMAND (int_l2_efp_filter_cli, static) = {
 };
 /* *INDENT-ON* */
 
+#endif /* CLIB_MARCH_VARIANT */
 
 /*
  * fd.io coding-style-patch-verification: ON