aboutsummaryrefslogtreecommitdiffstats
path: root/vnet/vnet/ethernet/ethernet.h
diff options
context:
space:
mode:
authorDamjan Marion <damarion@cisco.com>2016-10-13 14:10:10 +0200
committerDave Barach <openvpp@barachs.net>2016-10-13 17:04:10 +0000
commit770930c45f9793151e2c39b5834b1c8e7210bbe6 (patch)
tree2cc2b0a149c7823a288bade456ac758b66e1b0ed /vnet/vnet/ethernet/ethernet.h
parent241e52222e5e5579516494a8d979b6cc282f4799 (diff)
feature: rename vnet_ip_feature_* to vnet_feature_*
Change-Id: Idf68266f705b0455e5ab0ac73d23c7e0f4120d5b Signed-off-by: Dave Barach <dave@barachs.net> Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'vnet/vnet/ethernet/ethernet.h')
-rw-r--r--vnet/vnet/ethernet/ethernet.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/vnet/vnet/ethernet/ethernet.h b/vnet/vnet/ethernet/ethernet.h
index 728da522e3a..973ed58ce72 100644
--- a/vnet/vnet/ethernet/ethernet.h
+++ b/vnet/vnet/ethernet/ethernet.h
@@ -43,7 +43,7 @@
#include <vnet/vnet.h>
#include <vnet/ethernet/packet.h>
#include <vnet/pg/pg.h>
-#include <vnet/ip/ip_feature_registration.h>
+#include <vnet/ip/feature_registration.h>
always_inline u64
ethernet_mac_address_u64 (u8 * a)
@@ -267,7 +267,7 @@ typedef struct
ip_config_main_t feature_config_mains[VNET_N_IP_FEAT];
/** Feature path configuration lists */
- vnet_ip_feature_registration_t *next_feature[VNET_N_IP_FEAT];
+ vnet_feature_registration_t *next_feature[VNET_N_IP_FEAT];
/** Save results for show command */
char **feature_nodes[VNET_N_IP_FEAT];
@@ -279,7 +279,7 @@ typedef struct
ethernet_main_t ethernet_main;
#define VNET_ETHERNET_TX_FEATURE_INIT(x,...) \
- __VA_ARGS__ vnet_ip_feature_registration_t tx_##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) \
@@ -288,7 +288,7 @@ static void __vnet_add_feature_registration_tx_##x (void) \
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
+__VA_ARGS__ vnet_feature_registration_t tx_##x
always_inline ethernet_type_info_t *