From 6ee4051139409eb53cd41b2b73dac838e8c4e8a0 Mon Sep 17 00:00:00 2001 From: Ole Troan Date: Mon, 12 Feb 2018 18:14:39 +0100 Subject: 6RD: Rewritten 6RD RFC5969 support. Change-Id: Ic30fbcb2630f39e45345d7215babf5d7ed4b33a0 Signed-off-by: Ole Troan --- src/vnet/fib/fib_entry.h | 5 ----- src/vnet/fib/fib_entry_src_special.c | 1 - src/vnet/fib/fib_path.c | 1 + 3 files changed, 1 insertion(+), 6 deletions(-) (limited to 'src/vnet/fib') diff --git a/src/vnet/fib/fib_entry.h b/src/vnet/fib/fib_entry.h index 273a5e66b15..d905a839c48 100644 --- a/src/vnet/fib/fib_entry.h +++ b/src/vnet/fib/fib_entry.h @@ -80,10 +80,6 @@ typedef enum fib_source_t_ { * IPv[46] Mapping */ FIB_SOURCE_MAP, - /** - * SIXRD - */ - FIB_SOURCE_SIXRD, /** * DHCP */ @@ -151,7 +147,6 @@ STATIC_ASSERT (sizeof(fib_source_t) == 1, [FIB_SOURCE_ADJ] = "adjacency", \ [FIB_SOURCE_MAP] = "MAP", \ [FIB_SOURCE_SR] = "SR", \ - [FIB_SOURCE_SIXRD] = "SixRD", \ [FIB_SOURCE_LISP] = "LISP", \ [FIB_SOURCE_CLASSIFY] = "classify", \ [FIB_SOURCE_DHCP] = "DHCP", \ diff --git a/src/vnet/fib/fib_entry_src_special.c b/src/vnet/fib/fib_entry_src_special.c index a2493bb5be9..a2899161c8f 100644 --- a/src/vnet/fib/fib_entry_src_special.c +++ b/src/vnet/fib/fib_entry_src_special.c @@ -64,7 +64,6 @@ fib_entry_src_special_register (void) { fib_entry_src_register(FIB_SOURCE_SPECIAL, &special_src_vft); fib_entry_src_register(FIB_SOURCE_MAP, &special_src_vft); - fib_entry_src_register(FIB_SOURCE_SIXRD, &special_src_vft); fib_entry_src_register(FIB_SOURCE_CLASSIFY, &special_src_vft); fib_entry_src_register(FIB_SOURCE_AE, &special_src_vft); fib_entry_src_register(FIB_SOURCE_PROXY, &special_src_vft); diff --git a/src/vnet/fib/fib_path.c b/src/vnet/fib/fib_path.c index ffb7ad228f1..b4f9971f52e 100644 --- a/src/vnet/fib/fib_path.c +++ b/src/vnet/fib/fib_path.c @@ -707,6 +707,7 @@ fib_path_attached_get_adj (fib_path_t *path, else { return (adj_glean_add_or_lock(dpo_proto_to_fib(path->fp_nh_proto), + link, path->attached.fp_interface, NULL)); } -- cgit 1.2.3-korg