Merge branch 'master' of https://github.com/frrouting/frr into evpn-ipv6-tenant-routing

Conflicts:
	bgpd/bgp_evpn.c

1 files changed, 11 insertions, 2 deletions

diff --git a/ospf6d/ospf6_zebra.c b/ospf6d/ospf6_zebra.c
index 4fb959b952..0decc09a29 100644
--- a/ospf6d/ospf6_zebra.c
+++ b/ospf6d/ospf6_zebra.c
@@ -55,13 +55,22 @@ static int ospf6_router_id_update_zebra(int command, struct zclient *zclient,
 
 	zebra_router_id_update_read(zclient->ibuf, &router_id);
 
+	om6->zebra_router_id = router_id.u.prefix4.s_addr;
+
 	if (o == NULL)
 		return 0;
 
 	o->router_id_zebra = router_id.u.prefix4;
+	if (IS_OSPF6_DEBUG_ZEBRA(RECV)) {
+		char buf[INET_ADDRSTRLEN];
+
+		zlog_debug("%s: zebra router-id %s update",
+			   __PRETTY_FUNCTION__,
+			   inet_ntop(AF_INET, &router_id.u.prefix4,
+				     buf, INET_ADDRSTRLEN));
+	}
 
-	if (o->router_id == 0)
-		o->router_id = (uint32_t)o->router_id_zebra.s_addr;
+	ospf6_router_id_update();
 
 	return 0;
 }