diff options
| author |   Damjan Marion <damarion@cisco.com> | 2016-11-09 19:54:20 +0100 |
|---|---|---|
| committer |   Dave Barach <openvpp@barachs.net> | 2016-11-11 14:39:00 +0000 |
| commit | 8b3191e6d715760deefe550b59c7d92be4b5cda9 (patch) | |
| tree | 721dd977986d12864346081fec6b245ea5a250e0 /vnet/vnet/ethernet/ethernet.h | |
| parent | 0178d52384e0428368f1acf3163e664ecda7b64c (diff) | |
feature: convert all feature nodes to new feature infra
Change-Id: I34c527ba910fb282a95458b78d1d684eb337905e
Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'vnet/vnet/ethernet/ethernet.h')
| -rw-r--r-- | vnet/vnet/ethernet/ethernet.h | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/vnet/vnet/ethernet/ethernet.h b/vnet/vnet/ethernet/ethernet.h index c31025b7840..e557a2c23cc 100644 --- a/vnet/vnet/ethernet/ethernet.h +++ b/vnet/vnet/ethernet/ethernet.h @@ -263,34 +263,12 @@ typedef struct /* debug: make sure we don't wipe out an ethernet registration by mistake */ u8 next_by_ethertype_register_called; - /** per-interface features */ - vnet_feature_config_main_t feature_config_mains[VNET_N_IP_FEAT]; - - /** Feature path configuration lists */ - vnet_feature_registration_t *next_feature[VNET_N_IP_FEAT]; - - /** Save results for show command */ - char **feature_nodes[VNET_N_IP_FEAT]; - - /** feature node indicies */ - u32 ethernet_tx_feature_drop; + /* Feature arc index */ + u8 output_feature_arc_index; } ethernet_main_t; ethernet_main_t ethernet_main; -#define VNET_ETHERNET_TX_FEATURE_INIT(x,...) \ - __VA_ARGS__ vnet_feature_registration_t tx_##x; \ -static void __vnet_add_feature_registration_tx_##x (void) \ - __attribute__((__constructor__)) ; \ -static void __vnet_add_feature_registration_tx_##x (void) \ -{ \ - ethernet_main_t * im = ðernet_main; \ - tx_##x.next = im->next_feature[VNET_IP_TX_FEAT]; \ - im->next_feature[VNET_IP_TX_FEAT] = &tx_##x; \ -} \ -__VA_ARGS__ vnet_feature_registration_t tx_##x - - always_inline ethernet_type_info_t * ethernet_get_type_info (ethernet_main_t * em, ethernet_type_t type) { |