From: Neale Ranns <nranns@cisco.com>
Date: Wed, 24 Oct 2018 09:31:51 +0000 (-0700)
Subject: L2-input/output: use feature enum type in flag update function
X-Git-Tag: v19.04-rc0~549
X-Git-Url: https://gerrit.fd.io/r/gitweb?p=vpp.git;a=commitdiff_plain;h=a1179589bea89b44f7b41001b5e5595a8793b1df

L2-input/output: use feature enum type in flag update function

Change-Id: I1f58f441c65fbca101bee2e864bfa6ae2306b475
Signed-off-by: Neale Ranns <nranns@cisco.com>
---

diff --git a/src/vnet/l2/l2_input.c b/src/vnet/l2/l2_input.c
index fbd3b940fae..85daba5a8ea 100644
--- a/src/vnet/l2/l2_input.c
+++ b/src/vnet/l2/l2_input.c
@@ -518,7 +518,8 @@ l2input_intf_config (u32 sw_if_index)
 
 /** Enable (or disable) the feature in the bitmap for the given interface. */
 u32
-l2input_intf_bitmap_enable (u32 sw_if_index, u32 feature_bitmap, u32 enable)
+l2input_intf_bitmap_enable (u32 sw_if_index,
+			    l2input_feat_masks_t feature_bitmap, u32 enable)
 {
   l2_input_config_t *config = l2input_intf_config (sw_if_index);
 
diff --git a/src/vnet/l2/l2_input.h b/src/vnet/l2/l2_input.h
index e7c413f59c4..f55e70371e0 100644
--- a/src/vnet/l2/l2_input.h
+++ b/src/vnet/l2/l2_input.h
@@ -135,6 +135,7 @@ STATIC_ASSERT (L2INPUT_N_FEAT <= 32, "too many l2 input features");
 /* Feature bit masks */
 typedef enum
 {
+  L2INPUT_FEAT_NONE = 0,
 #define _(sym,str) L2INPUT_FEAT_##sym = (1<<L2INPUT_FEAT_##sym##_BIT),
   foreach_l2input_feat
 #undef _
@@ -194,7 +195,8 @@ l2_input_config_t *l2input_intf_config (u32 sw_if_index);
 
 /* Enable (or disable) the feature in the bitmap for the given interface */
 u32 l2input_intf_bitmap_enable (u32 sw_if_index,
-				u32 feature_bitmap, u32 enable);
+				l2input_feat_masks_t feature_bitmap,
+				u32 enable);
 
 /* Sets modifies flags from a bridge domain */
 u32 l2input_set_bridge_features (u32 bd_index, u32 feat_mask, u32 feat_value);
diff --git a/src/vnet/l2/l2_output.c b/src/vnet/l2/l2_output.c
index 4b933315a8c..31e3f067749 100644
--- a/src/vnet/l2/l2_output.c
+++ b/src/vnet/l2/l2_output.c
@@ -612,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;
diff --git a/src/vnet/l2/l2_output.h b/src/vnet/l2/l2_output.h
index 452d99b8a3b..a6db776841d 100644
--- a/src/vnet/l2/l2_output.h
+++ b/src/vnet/l2/l2_output.h
@@ -108,6 +108,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 _
@@ -159,7 +160,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