From: Sri Mohana Singamsetty <srimohans@gmail.com>
Date: Sun, 5 Apr 2020 18:41:42 +0000 (-0700)
Subject: Merge pull request #6105 from vivek-cumulus/bgp_link_bandwidth_unequal_cost_multipath
X-Git-Tag: base_7.4~133
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=70ecc066e7d8a213a0c636fabd889614afc7ec18;p=matthieu%2Ffrr.git

Merge pull request #6105 from vivek-cumulus/bgp_link_bandwidth_unequal_cost_multipath

Unequal cost multipath (a.ka. weighted ECMP) with BGP link-bandwidth
---

70ecc066e7d8a213a0c636fabd889614afc7ec18
diff --cc bgpd/bgp_route.c
index 7aea1fec14,2009375c89..a11e1d7c69
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@@ -2613,9 -2640,10 +2640,10 @@@ static void bgp_process_main_one(struc
  		bgp_path_info_set_flag(rn, new_select, BGP_PATH_SELECTED);
  		bgp_path_info_unset_flag(rn, new_select, BGP_PATH_ATTR_CHANGED);
  		UNSET_FLAG(new_select->flags, BGP_PATH_MULTIPATH_CHG);
+ 		UNSET_FLAG(new_select->flags, BGP_PATH_LINK_BW_CHG);
  	}
  
 -#if ENABLE_BGP_VNC
 +#ifdef ENABLE_BGP_VNC
  	if ((afi == AFI_IP || afi == AFI_IP6) && (safi == SAFI_UNICAST)) {
  		if (old_select != new_select) {
  			if (old_select) {
diff --cc bgpd/bgp_routemap.c
index 8bc4ef6893,eec6b3470b..758141c9f2
--- a/bgpd/bgp_routemap.c
+++ b/bgpd/bgp_routemap.c
@@@ -63,8 -63,9 +63,9 @@@
  #include "bgpd/bgp_pbr.h"
  #include "bgpd/bgp_flowspec_util.h"
  #include "bgpd/bgp_encap_types.h"
+ #include "bgpd/bgp_mpath.h"
  
 -#if ENABLE_BGP_VNC
 +#ifdef ENABLE_BGP_VNC
  #include "bgpd/rfapi/bgp_rfapi_cfg.h"
  #endif