ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove last vestigies of auto-ip-table create

Browse Source 
Change-Id: If0f8472c0de5e324b24c9c672c0f8b57cc9f49a8
Signed-off-by: Neale Ranns <neale.ranns@cisco.com>
This commit is contained in:
Neale Ranns
2018-01-25 07:48:12 -08:00
committed by Ole Trøan
parent 84a30ef2b5
commit b93078df66
1 changed files with 4 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/vnet/ip/ip_api.c
View File

@ -1022,23 +1022,11 @@ add_del_route_check (fib_protocol_t table_proto,
{
vnet_main_t *vnm = vnet_get_main ();
/* Temporaray whilst I do the CSIT dance */
u8 create_missing_tables = 1;
*fib_index = fib_table_find (table_proto, ntohl (table_id));
if (~0 == *fib_index)
{
if (create_missing_tables)
{
*fib_index = fib_table_find_or_create_and_lock (table_proto,
ntohl (table_id),
FIB_SOURCE_API);
}
else
{
/* No such VRF, and we weren't asked to create one */
return VNET_API_ERROR_NO_SUCH_FIB;
}
/* No such VRF, and we weren't asked to create one */
return VNET_API_ERROR_NO_SUCH_FIB;
}
if (!is_rpf_id && ~0 != ntohl (next_hop_sw_if_index))
@ -1067,26 +1055,8 @@ add_del_route_check (fib_protocol_t table_proto,
if (~0 == *next_hop_fib_index)
{
if (create_missing_tables)
{
if (is_rpf_id)
*next_hop_fib_index =
mfib_table_find_or_create_and_lock (fib_nh_proto,
ntohl
(next_hop_table_id),
MFIB_SOURCE_API);
else
*next_hop_fib_index =
fib_table_find_or_create_and_lock (fib_nh_proto,
ntohl
(next_hop_table_id),
FIB_SOURCE_API);
}
else
{
/* No such VRF, and we weren't asked to create one */
return VNET_API_ERROR_NO_SUCH_FIB;
}
/* No such VRF, and we weren't asked to create one */
return VNET_API_ERROR_NO_SUCH_FIB;
}
}