From: Don Slice <dslice@cumulusnetworks.com>
Date: Wed, 13 Mar 2019 17:41:40 +0000 (+0000)
Subject: Revert "bgpd: fix updating redist bitmask when vrf_id changes"
X-Git-Tag: 7.1_pulled~168^2~2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=7e20406f0345c2f152a66b20a31044a9d4c59e7c;p=mirror%2Ffrr.git

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 5f0b20e029..4285955034 100644
--- 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],