diff options
| -rw-r--r-- | src/vnet/l2/l2_input.h | 17 | ||||
| -rw-r--r-- | src/vnet/l2/l2_output.h | 6 |
2 files changed, 7 insertions, 16 deletions
diff --git a/src/vnet/l2/l2_input.h b/src/vnet/l2/l2_input.h index 23bb9b6e2f1..ea9dcad63e5 100644 --- a/src/vnet/l2/l2_input.h +++ b/src/vnet/l2/l2_input.h @@ -35,6 +35,12 @@ typedef struct u32 output_sw_if_index; /* for xconnect */ }; + /* config for which input features are configured on this interface */ + u32 feature_bitmap; + + /* split horizon group */ + u8 shg; + /* Interface mode. If both are 0, this interface is in L3 mode */ u8 xconnect; u8 bridge; @@ -42,17 +48,6 @@ typedef struct /* this is the bvi interface for the bridge-domain */ u8 bvi; - /* config for which input features are configured on this interface */ - u32 feature_bitmap; - - /* some of these flags are also in the feature bitmap */ - u8 learn_enable; - u8 fwd_enable; - u8 flood_enable; - - /* split horizon group */ - u8 shg; - } l2_input_config_t; diff --git a/src/vnet/l2/l2_output.h b/src/vnet/l2/l2_output.h index 6b00d01655c..b3d3505b813 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; |