]> git.proxmox.com Git - mirror_frr.git/commitdiff
zebra: debug_nl.c ensure we can read RTM_NEWNEIGH bridge nested attrs
authorDonald Sharp <sharpd@nvidia.com>
Thu, 28 Oct 2021 12:16:49 +0000 (08:16 -0400)
committerDonald Sharp <sharpd@nvidia.com>
Thu, 28 Oct 2021 12:16:49 +0000 (08:16 -0400)
The kernel can return to us nested attributes for BRIDGE RTM_NEWNEIGH
attributes.  Just ensure that we can parse and read them.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
zebra/debug_nl.c

index 7a44ff761b03d1e813c2bf3c8307d2c070b6441d..0e0ccccb6a24ba0c09188df61f2db5ca112f468b 100644 (file)
@@ -927,7 +927,7 @@ next_rta:
        plen = RTA_PAYLOAD(rta);
        zlog_debug("    rta [len=%d (payload=%zu) type=(%d) %s]", rta->rta_len,
                   plen, rta->rta_type, neigh_rta2str(rta->rta_type));
-       switch (rta->rta_type) {
+       switch (rta->rta_type & ~ NLA_F_NESTED) {
        case NDA_LLADDR:
                datap = RTA_DATA(rta);
                dbuf[0] = 0;