summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Walton <dwalton@cumulusnetworks.com>2015-07-22 21:35:38 +0200
committerDonald Sharp <sharpd@cumulusnetworks.com>2015-07-22 21:35:38 +0200
commitb354c427e18c595c71d497a38aa984ae244228eb (patch)
treed8b5e25422e498167d0fe7dfd0d10e0bef445f8d
parentbgpd-capability-cleanup.patch (diff)
downloadfrr-b354c427e18c595c71d497a38aa984ae244228eb.tar.xz
frr-b354c427e18c595c71d497a38aa984ae244228eb.zip
multipath is broken if deterministic-med is enabled
-rw-r--r--bgpd/bgp_route.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index f1982b101..0c4b79cf9 100644
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -1877,10 +1877,6 @@ bgp_best_selection (struct bgp *bgp, struct bgp_node *rn,
if (ri->peer->status != Established)
continue;
- if (bgp_flag_check (bgp, BGP_FLAG_DETERMINISTIC_MED)
- && (! CHECK_FLAG (ri->flags, BGP_INFO_DMED_SELECTED)))
- continue;
-
bgp_info_cmp (bgp, ri, new_select, &paths_eq, mpath_cfg, debug, pfx_buf);
if (paths_eq)
@@ -1893,9 +1889,7 @@ bgp_best_selection (struct bgp *bgp, struct bgp_node *rn,
}
}
- if (!bgp_flag_check (bgp, BGP_FLAG_DETERMINISTIC_MED))
- bgp_info_mpath_update (rn, new_select, old_select, &mp_list, mpath_cfg);
-
+ bgp_info_mpath_update (rn, new_select, old_select, &mp_list, mpath_cfg);
bgp_info_mpath_aggregate_update (new_select, old_select);
bgp_mp_list_clear (&mp_list);