From: Daniel Walton <dwalton@cumulusnetworks.com>
Date: Wed, 22 Jul 2015 19:35:38 +0000 (-0700)
Subject: multipath is broken if deterministic-med is enabled
X-Git-Tag: frr-2.0-rc1~1305
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=b354c427e18c595c71d497a38aa984ae244228eb;p=matthieu%2Ffrr.git

multipath is broken if deterministic-med is enabled
---

diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index f1982b101b..0c4b79cf98 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);