diff options
author | Neale Ranns <nranns@cisco.com> | 2016-10-03 09:40:25 +0100 |
---|---|---|
committer | Florin Coras <florin.coras@gmail.com> | 2016-10-03 11:45:15 +0000 |
commit | 5e575b1d59a5a4c1590ca09d6383a876fb9fdd25 (patch) | |
tree | fcba6d058fe32d9b32fe246577565020d10455ff /vnet/vnet/ip/ip4.h | |
parent | 553d808fc44e61846e4cda108083dd88beb338e3 (diff) |
L2 over LISP and GRE (VPP-457)
Change-Id: I0d7f9c7f41a9f9e0acb0950adedb90d45df08c2a
Signed-off-by: Neale Ranns <nranns@cisco.com>
Diffstat (limited to 'vnet/vnet/ip/ip4.h')
-rw-r--r-- | vnet/vnet/ip/ip4.h | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/vnet/vnet/ip/ip4.h b/vnet/vnet/ip/ip4.h index f9fe48687c1..d3db4debd8c 100644 --- a/vnet/vnet/ip/ip4.h +++ b/vnet/vnet/ip/ip4.h @@ -117,9 +117,7 @@ typedef struct ip4_main_t { vlib_packet_template_t ip4_arp_request_packet_template; /** Feature path configuration lists */ - vnet_ip_feature_registration_t * next_uc_feature; - vnet_ip_feature_registration_t * next_mc_feature; - vnet_ip_feature_registration_t * next_tx_feature; + vnet_ip_feature_registration_t * next_feature[VNET_N_IP_FEAT]; /** Built-in unicast feature path index, see @ref ip_feature_init_cast() */ u32 ip4_unicast_rx_feature_check_access; @@ -181,8 +179,8 @@ static void __vnet_add_feature_registration_uc_##x (void) \ static void __vnet_add_feature_registration_uc_##x (void) \ { \ ip4_main_t * im = &ip4_main; \ - uc_##x.next = im->next_uc_feature; \ - im->next_uc_feature = &uc_##x; \ + uc_##x.next = im->next_feature[VNET_IP_RX_UNICAST_FEAT]; \ + im->next_feature[VNET_IP_RX_UNICAST_FEAT] = &uc_##x; \ } \ __VA_ARGS__ vnet_ip_feature_registration_t uc_##x @@ -193,8 +191,8 @@ static void __vnet_add_feature_registration_mc_##x (void) \ static void __vnet_add_feature_registration_mc_##x (void) \ { \ ip4_main_t * im = &ip4_main; \ - mc_##x.next = im->next_mc_feature; \ - im->next_mc_feature = &mc_##x; \ + mc_##x.next = im->next_feature[VNET_IP_RX_MULTICAST_FEAT]; \ + im->next_feature[VNET_IP_RX_MULTICAST_FEAT] = &mc_##x; \ } \ __VA_ARGS__ vnet_ip_feature_registration_t mc_##x @@ -205,8 +203,8 @@ static void __vnet_add_feature_registration_tx_##x (void) \ static void __vnet_add_feature_registration_tx_##x (void) \ { \ ip4_main_t * im = &ip4_main; \ - tx_##x.next = im->next_tx_feature; \ - im->next_tx_feature = &tx_##x; \ + tx_##x.next = im->next_feature[VNET_IP_TX_FEAT]; \ + im->next_feature[VNET_IP_TX_FEAT] = &tx_##x; \ } \ __VA_ARGS__ vnet_ip_feature_registration_t tx_##x |