X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fl2%2Fl2_output.h;h=74d2829839f6aed85815d58ce77807d115977995;hb=5d9df1db07969fea8f391bd48ba14cceb840da1e;hp=3b6e480d1dcea50990986a9f10c840296f20ea28;hpb=71612d61930e57e7c8ebf9e5647b15a4b23720b2;p=vpp.git

diff --git a/src/vnet/l2/l2_output.h b/src/vnet/l2/l2_output.h
index 3b6e480d1dc..74d2829839f 100644
--- 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;
@@ -85,6 +81,8 @@ extern vlib_node_registration_t l2output_node;
 #define foreach_l2output_feat \
  _(OUTPUT,            "interface-output")           \
  _(SPAN,              "span-l2-output")             \
+ _(GBP_POLICY_PORT,   "gbp-policy-port")            \
+ _(GBP_POLICY_MAC,    "gbp-policy-mac")             \
  _(CFM,               "feature-bitmap-drop")        \
  _(QOS,               "feature-bitmap-drop")        \
  _(ACL,               "l2-output-acl")              \
@@ -94,6 +92,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 */
@@ -110,6 +109,7 @@ STATIC_ASSERT (L2OUTPUT_N_FEAT <= 32, "too many l2 output features");
 /* Feature bit masks */
 typedef enum
 {
+  L2OUTPUT_FEAT_NONE = 0,
 #define _(sym,str) L2OUTPUT_FEAT_##sym = (1<<L2OUTPUT_FEAT_##sym##_BIT),
   foreach_l2output_feat
 #undef _
@@ -141,7 +141,7 @@ typedef enum
 /* Return an array of strings containing graph node names of each feature */
 char **l2output_get_feat_names (void);
 
-/* arg0 - u32 feature_bitmap */
+/* arg0 - u32 feature_bitmap, arg1 - u32 verbose */
 u8 *format_l2_output_features (u8 * s, va_list * args);
 
 /**
@@ -161,7 +161,8 @@ l2_output_config_t *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_feat_masks_t feature_bitmap,
+				  u32 enable);
 
 #endif