Revert "bgpd: fix updating redist bitmask when vrf_id changes"

This reverts commit 48c74f88259c8f706035d6fc80765f4a6f6594f7.

diff --git a/bgpd/bgp_zebra.c b/bgpd/bgp_zebra.c
index 5f0b20e029d410543602d83b4540de2e2a2057de..42859550346a7c53af7a774de4992e895e6edc51 100644 (file)
--- a/bgpd/bgp_zebra.c
+++ b/bgpd/bgp_zebra.c
@@ -1829,9 +1829,8 @@ void bgp_update_redist_vrf_bitmaps(struct bgp *bgp, vrf_id_t old_vrf_id)
 
        for (afi = AFI_IP; afi < AFI_MAX; afi++)
                for (i = 0; i < ZEBRA_ROUTE_MAX; i++)
-                       if ((old_vrf_id == VRF_UNKNOWN)
-                           || vrf_bitmap_check(zclient->redist[afi][i],
-                                               old_vrf_id)) {
+                       if (vrf_bitmap_check(zclient->redist[afi][i],
+                                            old_vrf_id)) {
                                vrf_bitmap_unset(zclient->redist[afi][i],
                                                 old_vrf_id);
                                vrf_bitmap_set(zclient->redist[afi][i],