Commit c2ce96da5a for frr
commit c2ce96da5a521e46827c7027f3352c0bdd5f2703
Author: Louis Scalbert <louis.scalbert@6wind.com>
Date: Mon Nov 2 13:52:19 2026 +0100
nhrpd: fix lladdr display in update binding logs
Log correct values.
Fixes: 5d9ebe6181 ("nhrp: fix race condition")
Signed-off-by: Louis Scalbert <louis.scalbert@6wind.com>
diff --git a/nhrpd/netlink_arp.c b/nhrpd/netlink_arp.c
index e16a0aac36..203a4f2b1b 100644
--- a/nhrpd/netlink_arp.c
+++ b/nhrpd/netlink_arp.c
@@ -187,15 +187,16 @@ int nhrp_neighbor_operation(ZAPI_CALLBACK_ARGS)
if (cmd == ZEBRA_NEIGH_GET) {
if (c->cur.type >= NHRP_CACHE_CACHED) {
nhrp_cache_set_used(c, 1);
- debugf(NHRP_DEBUG_KERNEL,
- "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;
+ debugf(NHRP_DEBUG_KERNEL,
+ "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);
+
/* In case of shortcuts, nbma is given by lladdr, not
* vc->remote.nbma.
*/