X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fl2%2Fl2_output.c;h=31e3f067749b802147545ab322d271188358795e;hb=a1179589bea89b44f7b41001b5e5595a8793b1df;hp=2811215307f8a9229f3e3150a534a65787202dd8;hpb=6e36351faf5b69a0bfb8235b3b06f8b2c24e5547;p=vpp.git

diff --git a/src/vnet/l2/l2_output.c b/src/vnet/l2/l2_output.c
index 2811215307f..31e3f067749 100644
--- a/src/vnet/l2/l2_output.c
+++ b/src/vnet/l2/l2_output.c
@@ -60,7 +60,7 @@ format_l2_output_features (u8 * s, va_list * args)
   int i;
   for (i = L2OUTPUT_N_FEAT - 1; i >= 0; i--)
     if (feature_bitmap & (1 << i))
-      s = format (s, "%10s (%s)\n", display_names[i], l2output_feat_names[i]);
+      s = format (s, "%17s (%s)\n", display_names[i], l2output_feat_names[i]);
   return s;
 }
 
@@ -260,8 +260,12 @@ l2output_process_batch (vlib_main_t * vm, vlib_node_runtime_t * node,
 {
   u32 feature_bitmap = config->feature_bitmap & ~L2OUTPUT_FEAT_OUTPUT;
   if (config->shg == 0 && feature_bitmap == 0)
-    l2output_process_batch_inline (vm, node, config, b, cdo, next, n_left,
-				   l2_efp, l2_vtr, l2_pbb, 0, 0);
+    {
+      if ((l2_efp | l2_vtr | l2_pbb) == 0)
+	return;
+      l2output_process_batch_inline (vm, node, config, b, cdo, next, n_left,
+				     l2_efp, l2_vtr, l2_pbb, 0, 0);
+    }
   else if (config->shg == 0)
     l2output_process_batch_inline (vm, node, config, b, cdo, next, n_left,
 				   l2_efp, l2_vtr, l2_pbb, 0, 1);
@@ -476,7 +480,7 @@ typedef enum
  * this sw_if_index, l2-output will send packets for this sw_if_index to the
  * l2-output-bad-intf node which just setup the proper drop reason before
  * sending packets to the error-drop node to drop the packet. Then, stale L2FIB
- * entries for delted tunnels won't cause possible packet or memory corrpution.
+ * entries for deleted tunnels won't cause possible packet or memory corruption.
  */
 
 VLIB_NODE_FN (l2output_bad_intf_node) (vlib_main_t * vm,
@@ -608,7 +612,8 @@ l2output_intf_config (u32 sw_if_index)
 
 /** Enable (or disable) the feature in the bitmap for the given interface. */
 void
-l2output_intf_bitmap_enable (u32 sw_if_index, u32 feature_bitmap, u32 enable)
+l2output_intf_bitmap_enable (u32 sw_if_index,
+			     l2output_feat_masks_t feature_bitmap, u32 enable)
 {
   l2output_main_t *mp = &l2output_main;
   l2_output_config_t *config;