bgpd: Fix call bgp_zebra_terminate_radv

The call into bgp_zebra_terminate_radv was
setting the peer->ifp to NULL before
calling into bgp_zebra_terminate_radv.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Reviewed-by: Vivek Venkatraman <vivek@cumulusnetworks.com>

diff --git a/bgpd/bgp_zebra.c b/bgpd/bgp_zebra.c
index 7f5f47e062aff0d3330dcb561dce3949f4582d82..377a6e08a688ca148ec1cfca4f4563959a19d2fd 100644 (file)
--- a/bgpd/bgp_zebra.c
+++ b/bgpd/bgp_zebra.c
@@ -183,11 +183,16 @@ bgp_update_interface_nbrs (struct bgp *bgp, struct interface *ifp,
       if (peer->conf_if &&
           (strcmp (peer->conf_if, ifp->name) == 0))
         {
-          peer->ifp = upd_ifp;
           if (upd_ifp)
-            bgp_zebra_initiate_radv (bgp, peer);
+           {
+             peer->ifp = upd_ifp;
+             bgp_zebra_initiate_radv (bgp, peer);
+           }
           else
-            bgp_zebra_terminate_radv (bgp, peer);
+           {
+             bgp_zebra_terminate_radv (bgp, peer);
+             peer->ifp = upd_ifp;
+           }
         }
     }
 }