diff options
| author |   Alberto Compagno <acompagn+fdio@cisco.com> | 2019-12-11 09:57:58 +0100 |
|---|---|---|
| committer | Aberto Compagno <acompagn+fdio@cisco.com> | 2020-01-30 08:21:50 +0000 |
| commit | 38682396416f315fb5c5b0f8c25beb7a6a909d4f (patch) | |
| tree | 9b56f4835a8936252f87bc19a27432b4bb8587c0 /hicn-plugin/src/faces/ip | |
| parent | fa11d711aaab5e4cba7e89dcc896866f3e73db3f (diff) | |
[HICN-445] Update to vpp 20.01
Change-Id: I19a442080b6ca8b0477a8f92f161282288c395ee
Signed-off-by: Alberto Compagno <acompagn+fdio@cisco.com>
Diffstat (limited to 'hicn-plugin/src/faces/ip')
| -rw-r--r-- | hicn-plugin/src/faces/ip/face_ip.c | 4 | ||||
| -rw-r--r-- | hicn-plugin/src/faces/ip/face_ip_node.c | 2 | ||||
| -rw-r--r-- | hicn-plugin/src/faces/ip/iface_ip_node.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/hicn-plugin/src/faces/ip/face_ip.c b/hicn-plugin/src/faces/ip/face_ip.c index d4ba158de..f4ae5429d 100644 --- a/hicn-plugin/src/faces/ip/face_ip.c +++ b/hicn-plugin/src/faces/ip/face_ip.c @@ -172,7 +172,7 @@ hicn_face_ip_del (hicn_face_id_t face_id) * @brief Helper for handling midchain adjacencies */ void face_midchain_fixup_t (vlib_main_t * vm, - struct ip_adjacency_t_ * adj, + const struct ip_adjacency_t_ * adj, vlib_buffer_t * b0, const void *data) { vnet_buffer (b0)->sw_if_index[VLIB_TX] = 0; @@ -213,7 +213,7 @@ hicn_face_ip_find_adj (const ip46_address_t * remote_addr, { u32 fib_index = fib_table_find_or_create_and_lock (fib_pfx.fp_proto, HICN_FIB_TABLE, - FIB_SOURCE_PLUGIN_HI); + FIB_SOURCE_PRIORITY_HI); fib_entry_index = fib_table_lookup (fib_index, &fib_pfx); diff --git a/hicn-plugin/src/faces/ip/face_ip_node.c b/hicn-plugin/src/faces/ip/face_ip_node.c index 1229b4eaa..0eeeab6fb 100644 --- a/hicn-plugin/src/faces/ip/face_ip_node.c +++ b/hicn-plugin/src/faces/ip/face_ip_node.c @@ -589,7 +589,7 @@ hicn_face_rewrite_interest (vlib_main_t * vm, vlib_buffer_t * b0, u32 fib_index = fib_table_find_or_create_and_lock (fib_pfx.fp_proto, HICN_FIB_TABLE, - FIB_SOURCE_PLUGIN_HI); + FIB_SOURCE_PRIORITY_HI); fib_entry_index = fib_table_lookup (fib_index, &fib_pfx); diff --git a/hicn-plugin/src/faces/ip/iface_ip_node.c b/hicn-plugin/src/faces/ip/iface_ip_node.c index 62ccc514d..8adef50d9 100644 --- a/hicn-plugin/src/faces/ip/iface_ip_node.c +++ b/hicn-plugin/src/faces/ip/iface_ip_node.c @@ -13,11 +13,11 @@ * limitations under the License. */ -#include <hicn/hicn.h> #include "face_ip.h" #include "dpo_ip.h" #include "../../strategy_dpo_manager.h" #include "../face.h" +#include "../../hicn.h" #include "../../infra.h" #include "../../cache_policies/cs_lru.h" |