]> git.puffer.fish Git - matthieu/frr.git/commitdiff
zebra: Fix code paths that always resolve to true
authorDonald Sharp <sharpd@nvidia.com>
Wed, 20 Oct 2021 14:15:41 +0000 (10:15 -0400)
committermergify-bot <noreply@mergify.io>
Wed, 20 Oct 2021 20:17:24 +0000 (20:17 +0000)
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
(cherry picked from commit e8e6febb746c52354396e4004fccc46ef4dde684)

zebra/zebra_l2.c

index 5a02149611fbaf8e8d27694ae8f28b439ac0140e..30e74902aa10a659668ade8c6a49b2d913533d36 100644 (file)
@@ -431,10 +431,10 @@ void zebra_l2if_update_bridge_slave(struct interface *ifp,
 
        if (zif->zif_type == ZEBRA_IF_VXLAN
            && chgflags != ZEBRA_BRIDGE_NO_ACTION) {
-               if (ZEBRA_BRIDGE_MASTER_MAC_CHANGE)
+               if (chgflags & ZEBRA_BRIDGE_MASTER_MAC_CHANGE)
                        zebra_vxlan_if_update(ifp,
                                              ZEBRA_VXLIF_MASTER_MAC_CHANGE);
-               if (ZEBRA_BRIDGE_MASTER_UP)
+               if (chgflags & ZEBRA_BRIDGE_MASTER_UP)
                        zebra_vxlan_if_update(ifp, ZEBRA_VXLIF_MASTER_CHANGE);
        }
        old_bridge_ifindex = zif->brslave_info.bridge_ifindex;