X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fclassify%2Fin_out_acl.c;h=7f5a926212c836a3c401e989c4b6a3c66cce96d2;hb=6fe7b75f3503aea950577ab769fdf292f3707256;hp=a34f6cec61a822a98dc5fa1de5fd7ac34dffe99c;hpb=815d7d5637fbffd20bf81c74fd59dac8e4fe4d94;p=vpp.git

diff --git a/src/vnet/classify/in_out_acl.c b/src/vnet/classify/in_out_acl.c
index a34f6cec61a..7f5a926212c 100644
--- a/src/vnet/classify/in_out_acl.c
+++ b/src/vnet/classify/in_out_acl.c
@@ -15,6 +15,8 @@
 #include <vnet/ip/ip.h>
 #include <vnet/classify/vnet_classify.h>
 #include <vnet/classify/in_out_acl.h>
+#include <vnet/l2/l2_output.h>
+#include <vnet/l2/l2_input.h>
 
 in_out_acl_main_t in_out_acl_main;
 
@@ -28,9 +30,12 @@ vnet_in_out_acl_ip_feature_enable (vlib_main_t * vnm,
 
   if (tid == IN_OUT_ACL_TABLE_L2)
     {
-      l2input_intf_bitmap_enable (sw_if_index,
-				  is_output ? L2OUTPUT_FEAT_ACL :
-				  L2INPUT_FEAT_ACL, feature_enable);
+      if (is_output)
+	l2output_intf_bitmap_enable (sw_if_index, L2OUTPUT_FEAT_ACL,
+				     feature_enable);
+      else
+	l2input_intf_bitmap_enable (sw_if_index, L2INPUT_FEAT_ACL,
+				    feature_enable);
     }
   else
     {				/* IP[46] */
@@ -246,10 +251,6 @@ clib_error_t *
 in_out_acl_init (vlib_main_t * vm)
 {
   in_out_acl_main_t *am = &in_out_acl_main;
-  clib_error_t *error = 0;
-
-  if ((error = vlib_call_init_function (vm, ip_in_out_acl_init)))
-    return error;
 
   am->vlib_main = vm;
   am->vnet_main = vnet_get_main ();
@@ -257,8 +258,12 @@ in_out_acl_init (vlib_main_t * vm)
 
   return 0;
 }
-
-VLIB_INIT_FUNCTION (in_out_acl_init);
+/* *INDENT-OFF* */
+VLIB_INIT_FUNCTION (in_out_acl_init) =
+{
+  .runs_after = VLIB_INITS("ip_in_out_acl_init"),
+};
+/* *INDENT-ON* */
 
 uword
 unformat_acl_type (unformat_input_t * input, va_list * args)