From 4fd5ea4b3edf602e35373b6548639aa0a6dda6c2 Mon Sep 17 00:00:00 2001 From: Anuradha Karuppiah Date: Tue, 16 Oct 2018 08:23:22 -0700 Subject: [PATCH] zebra: make neigh active when it is modified from local to remote This is a fixup to commit - f32ea5c07 - zebra: act on kernel notifications for remote neighbors The original commit handled a race condition between kernel and zebra that would result in an inconsistent state i.e. kernel has an offload/remote neigh zebra has a local neigh The original commit missed setting the neigh to active when zebra tried to resolve the inconsistency by modifying the local neigh to remote neigh on hearing back its own kernel update. Fixed here. Signed-off-by: Anuradha Karuppiah Signed-off-by: Vivek Venkatraman Ticket: CM-22700 --- zebra/zebra_vxlan.c | 1 + 1 file changed, 1 insertion(+) diff --git a/zebra/zebra_vxlan.c b/zebra/zebra_vxlan.c index 9ecf834333..b98b7381f4 100644 --- a/zebra/zebra_vxlan.c +++ b/zebra/zebra_vxlan.c @@ -2218,6 +2218,7 @@ static int zvni_remote_neigh_update(zebra_vni_t *zvni, UNSET_FLAG(n->flags, ZEBRA_NEIGH_LOCAL); SET_FLAG(n->flags, ZEBRA_NEIGH_REMOTE); + ZEBRA_NEIGH_SET_ACTIVE(n); n->r_vtep_ip = zmac->fwd_info.r_vtep_ip; } -- 2.39.5