Merge pull request #15316 from LabNConsulting/working/lb/nhrp-nexthop…

…-race-cond

nhrp: fix race condition in  null lladdr from zebra

nhrpd/netlink_arp.c

@@ -191,6 +191,11 @@ int nhrp_neighbor_operation(ZAPI_CALLBACK_ARGS)
 			       "Netlink: update binding for %pSU dev %s from c %pSU peer.vc.nbma %pSU to lladdr %pSU",
 			       &addr, ifp->name, &c->cur.remote_nbma_natoa,
 			       &c->cur.peer->vc->remote.nbma, &lladdr);
+
+			if (lladdr.sa.sa_family == AF_UNSPEC)
+				/* nothing from zebra, so use nhrp peer */
+				lladdr = c->cur.peer->vc->remote.nbma;
+
 			/* In case of shortcuts, nbma is given by lladdr, not
 			 * vc->remote.nbma.
 			 */