VPP-1474: fix coverity warning

[vpp.git] / src / vnet / l2 / l2_output.h

diff --git a/src/vnet/l2/l2_output.h b/src/vnet/l2/l2_output.h
index 1a73fdf..452d99b 100644 (file)
--- a/src/vnet/l2/l2_output.h
+++ b/src/vnet/l2/l2_output.h
@@ -28,8 +28,6 @@
 typedef struct
 {
 
-  u32 feature_bitmap;
-
   /*
    * vlan tag rewrite for ingress and egress
    * ingress vtr is located here because the same config data is used for
@@ -40,9 +38,7 @@ typedef struct
   ptr_config_t input_pbb_vtr;
   ptr_config_t output_pbb_vtr;
 
-  /* some of these flags may get integrated into the feature bitmap */
-  u8 fwd_enable;
-  u8 flood_enable;
+  u32 feature_bitmap;
 
   /* split horizon group */
   u8 shg;
@@ -75,7 +71,7 @@ typedef struct
   vnet_main_t *vnet_main;
 } l2output_main_t;
 
-l2output_main_t l2output_main;
+extern l2output_main_t l2output_main;
 
 extern vlib_node_registration_t l2output_node;
 
@@ -85,6 +81,7 @@ extern vlib_node_registration_t l2output_node;
 #define foreach_l2output_feat \
  _(OUTPUT,            "interface-output")           \
  _(SPAN,              "span-l2-output")             \
+ _(GBP_POLICY,        "gbp-policy")                 \
  _(CFM,               "feature-bitmap-drop")        \
  _(QOS,               "feature-bitmap-drop")        \
  _(ACL,               "l2-output-acl")              \
@@ -94,6 +91,7 @@ extern vlib_node_registration_t l2output_node;
  _(STP_BLOCKED,       "feature-bitmap-drop")        \
  _(LINESTATUS_DOWN,   "feature-bitmap-drop")        \
  _(OUTPUT_CLASSIFY,   "l2-output-classify")        \
+ _(OUTPUT_FEAT_ARC,   "l2-output-feat-arc")        \
  _(XCRW,             "l2-xcrw")
 
 /* Feature bitmap positions */