diff options
| author |   Neale Ranns <nranns@cisco.com> | 2017-01-09 01:00:45 -0800 |
|---|---|---|
| committer |   Ole Trøan <otroan@employees.org> | 2017-01-10 14:09:55 +0000 |
| commit | 75152289284aaf1116d62c6cdef5a3b0c793fa15 (patch) | |
| tree | 7ced5e87b0db3eabdc5062d1b589d21962116521 /src/vnet/ip/ip6_forward.c | |
| parent | 553a41190963099631a73fb0a77b07b871d65e70 (diff) | |
IPv6 NS RS tests and fixes
includes Fix for VPP-584 with API change to remove prefix length from LL programming
Change-Id: If860751c35e60255fb977f73bc33e8c2649e728e
Signed-off-by: Neale Ranns <nranns@cisco.com>
Diffstat (limited to 'src/vnet/ip/ip6_forward.c')
| -rw-r--r-- | src/vnet/ip/ip6_forward.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/vnet/ip/ip6_forward.c b/src/vnet/ip/ip6_forward.c index b5c79552..866a44e6 100644 --- a/src/vnet/ip/ip6_forward.c +++ b/src/vnet/ip/ip6_forward.c @@ -404,8 +404,10 @@ ip6_sw_interface_enable_disable (u32 sw_if_index, u32 is_enable) } else { - ASSERT (im->ip_enabled_by_sw_if_index[sw_if_index] > 0); - if (0 != --im->ip_enabled_by_sw_if_index[sw_if_index]) + /* The ref count is 0 when an address is removed from an interface that has + * no address - this is not a ciritical error */ + if (0 == im->ip_enabled_by_sw_if_index[sw_if_index] || + 0 != --im->ip_enabled_by_sw_if_index[sw_if_index]) return; } |