]> git.puffer.fish Git - matthieu/frr.git/commitdiff
pimd: skip syncing and running DF election on orig mroutes
authorAnuradha Karuppiah <anuradhak@cumulusnetworks.com>
Thu, 6 Feb 2020 17:30:46 +0000 (09:30 -0800)
committerAnuradha Karuppiah <anuradhak@cumulusnetworks.com>
Fri, 14 Feb 2020 17:18:30 +0000 (09:18 -0800)
This is not causing functional problems but has become a source
of confusion. DF status is only relevant to multicast tunnel decaps.

Signed-off-by: Anuradha Karuppiah <anuradhak@cumulusnetworks.com>
pimd/pim_upstream.c

index 6ef0290adf81751e3e33d99e89f031470c230d49..ec1888f1f7f64b4544b7424360978a41e25d18b6 100644 (file)
@@ -892,7 +892,8 @@ static struct pim_upstream *pim_upstream_new(struct pim_instance *pim,
         */
        if ((up->sg.src.s_addr != INADDR_ANY) &&
                up->parent &&
-               PIM_UPSTREAM_FLAG_TEST_MLAG_VXLAN(up->parent->flags)) {
+               PIM_UPSTREAM_FLAG_TEST_MLAG_VXLAN(up->parent->flags) &&
+               !PIM_UPSTREAM_FLAG_TEST_SRC_VXLAN_ORIG(up->flags)) {
                PIM_UPSTREAM_FLAG_SET_MLAG_VXLAN(up->flags);
                if (PIM_DEBUG_VXLAN)
                        zlog_debug("upstream %s inherited mlag vxlan flag from parent",