IPSEC; dpdk backend for tunnel interface encryption

[vpp.git] / src / vnet / interface.h

diff --git a/src/vnet/interface.h b/src/vnet/interface.h
index 5c41859..c32311c 100644 (file)
--- a/src/vnet/interface.h
+++ b/src/vnet/interface.h
@@ -131,7 +131,7 @@ static void __vnet_interface_function_deinit_##tag##_##f (void)         \
 {                                                                       \
  vnet_main_t * vnm = vnet_get_main();                                   \
  _vnet_interface_function_list_elt_t *next;                             \
- if (vnm->tag##_functions[p]->fp == (void *) &f)                        \
+ if (vnm->tag##_functions[p]->fp == f)                                  \
     {                                                                   \
       vnm->tag##_functions[p] =                                         \
         vnm->tag##_functions[p]->next_interface_function;               \
@@ -140,7 +140,7 @@ static void __vnet_interface_function_deinit_##tag##_##f (void)         \
   next = vnm->tag##_functions[p];                                       \
   while (next->next_interface_function)                                 \
     {                                                                   \
-      if (next->next_interface_function->fp == (void *) &f)             \
+      if (next->next_interface_function->fp == f)                       \
         {                                                               \
           next->next_interface_function =                               \
             next->next_interface_function->next_interface_function;     \
@@ -302,9 +302,6 @@ CLIB_MARCH_SFX (devclass##_tx_fn_multiarch_register) (void)         \
 }                                                                      \
 uword CLIB_CPU_OPTIMIZED CLIB_MARCH_SFX (devclass##_tx_fn)
 
-/* FIXME to be removed */
-#define VLIB_DEVICE_TX_FUNCTION_MULTIARCH(dev, fn)
-
 /**
  * Link Type: A description of the protocol of packets on the link.
  * On an ethernet link this maps directly into the ethertype. On a GRE tunnel
@@ -764,7 +761,7 @@ typedef enum
   _(RX_MULTICAST, rx-multicast, if)            \
   _(RX_BROADCAST, rx-broadcast, if)            \
   _(TX, tx, if)                                        \
-  _(TX_UNICAST, tx-unicast-miss, if)           \
+  _(TX_UNICAST, tx-unicast, if)                        \
   _(TX_MULTICAST, tx-multicast, if)            \
   _(TX_BROADCAST, tx-broadcast, if)