Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Revert "MTU: Setting of MTU on software interface (instead of hardware interface)"
[vpp.git]
/
src
/
vnet
/
ipip
/
sixrd.c
diff --git
a/src/vnet/ipip/sixrd.c
b/src/vnet/ipip/sixrd.c
index
c44c834
..
cfdd0f8
100644
(file)
--- a/
src/vnet/ipip/sixrd.c
+++ b/
src/vnet/ipip/sixrd.c
@@
-36,7
+36,6
@@
#include <vnet/fib/fib_table.h>
#include <vnet/fib/ip6_fib.h>
#include <vnet/plugin/plugin.h>
#include <vnet/fib/fib_table.h>
#include <vnet/fib/ip6_fib.h>
#include <vnet/plugin/plugin.h>
-#include <vpp/app/version.h> // Really needed?
extern vlib_node_registration_t ip4_sixrd_node;
extern vlib_node_registration_t ip4_sixrd_node;
@@
-195,6
+194,9
@@
sixrd_update_adj (vnet_main_t * vnm, u32 sw_if_index, adj_index_t ai)
ip_adjacency_t *adj = adj_get (ai);
ipip_tunnel_t *t = ipip_tunnel_db_find_by_sw_if_index (sw_if_index);
ip_adjacency_t *adj = adj_get (ai);
ipip_tunnel_t *t = ipip_tunnel_db_find_by_sw_if_index (sw_if_index);
+ /* Not our tunnel */
+ if (!t)
+ return;
if (!memcmp (&sixrd_special_nh, &adj->sub_type.nbr.next_hop,
sizeof (sixrd_special_nh)))
{
if (!memcmp (&sixrd_special_nh, &adj->sub_type.nbr.next_hop,
sizeof (sixrd_special_nh)))
{
@@
-499,7
+501,7
@@
sixrd_init (vlib_main_t * vm)
clib_error_t *error = 0;
/* Make sure the IPIP tunnel subsystem is initialised */
clib_error_t *error = 0;
/* Make sure the IPIP tunnel subsystem is initialised */
- vlib_call_init_function (vm, ipip_init);
+
error =
vlib_call_init_function (vm, ipip_init);
sixrd_adj_delegate_type =
adj_delegate_register_new_type (&sixrd_adj_delegate_vft);
sixrd_adj_delegate_type =
adj_delegate_register_new_type (&sixrd_adj_delegate_vft);