From: Igor Ryzhov <iryzhov@nfware.com>
Date: Thu, 13 May 2021 22:50:05 +0000 (+0300)
Subject: Revert "bgpd: Respect `-e X` value for multipath"
X-Git-Tag: frr-8.0~24^2~27
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=ba377b7b5d47ccaa17128b804a0ecc3dbe408d47;p=matthieu%2Ffrr.git

Revert "bgpd: Respect `-e X` value for multipath"

This reverts commit 76bd07b6881add1fbeafa5dc11c48d9ad6a00f14.
---

diff --git a/bgpd/bgp_nb_config.c b/bgpd/bgp_nb_config.c
index 3d744e18bb..a00fae3401 100644
--- a/bgpd/bgp_nb_config.c
+++ b/bgpd/bgp_nb_config.c
@@ -9026,10 +9026,10 @@ int bgp_global_afi_safis_afi_safi_ipv4_unicast_use_multiple_paths_ebgp_maximum_p
 	switch (args->event) {
 	case NB_EV_VALIDATE:
 		maxpaths = yang_dnode_get_uint16(args->dnode, NULL);
-		if (maxpaths > multipath_num) {
+		if (maxpaths > MULTIPATH_NUM) {
 			snprintf(args->errmsg, args->errmsg_len,
 				 "maxpaths %u is out of range %u", maxpaths,
-				 multipath_num);
+				 MULTIPATH_NUM);
 			return NB_ERR_VALIDATION;
 		}
 		break;
@@ -9097,10 +9097,10 @@ int bgp_global_afi_safis_afi_safi_ipv4_unicast_use_multiple_paths_ibgp_maximum_p
 	switch (args->event) {
 	case NB_EV_VALIDATE:
 		maxpaths = yang_dnode_get_uint16(args->dnode, NULL);
-		if (maxpaths > multipath_num) {
+		if (maxpaths > MULTIPATH_NUM) {
 			snprintf(args->errmsg, args->errmsg_len,
 				 "maxpaths %u is out of range %u", maxpaths,
-				 multipath_num);
+				 MULTIPATH_NUM);
 			return NB_ERR_VALIDATION;
 		}
 		break;
@@ -10945,10 +10945,10 @@ int bgp_global_afi_safis_afi_safi_ipv6_unicast_use_multiple_paths_ebgp_maximum_p
 	switch (args->event) {
 	case NB_EV_VALIDATE:
 		maxpaths = yang_dnode_get_uint16(args->dnode, NULL);
-		if (maxpaths > multipath_num) {
+		if (maxpaths > MULTIPATH_NUM) {
 			snprintf(args->errmsg, args->errmsg_len,
 				 "maxpaths %u is out of range %u", maxpaths,
-				 multipath_num);
+				 MULTIPATH_NUM);
 			return NB_ERR_VALIDATION;
 		}
 		break;
@@ -11707,10 +11707,10 @@ int bgp_global_afi_safis_afi_safi_ipv4_labeled_unicast_use_multiple_paths_ebgp_m
 	switch (args->event) {
 	case NB_EV_VALIDATE:
 		maxpaths = yang_dnode_get_uint16(args->dnode, NULL);
-		if (maxpaths > multipath_num) {
+		if (maxpaths > MULTIPATH_NUM) {
 			snprintf(args->errmsg, args->errmsg_len,
 				 "maxpaths %u is out of range %u", maxpaths,
-				 multipath_num);
+				 MULTIPATH_NUM);
 			return NB_ERR_VALIDATION;
 		}
 		break;
@@ -11945,10 +11945,10 @@ int bgp_global_afi_safis_afi_safi_ipv6_labeled_unicast_use_multiple_paths_ebgp_m
 	switch (args->event) {
 	case NB_EV_VALIDATE:
 		maxpaths = yang_dnode_get_uint16(args->dnode, NULL);
-		if (maxpaths > multipath_num) {
+		if (maxpaths > MULTIPATH_NUM) {
 			snprintf(args->errmsg, args->errmsg_len,
 				 "maxpaths %u is out of range %u", maxpaths,
-				 multipath_num);
+				 MULTIPATH_NUM);
 			return NB_ERR_VALIDATION;
 		}
 		break;
@@ -11975,10 +11975,10 @@ int bgp_global_afi_safis_afi_safi_ipv6_labeled_unicast_use_multiple_paths_ibgp_m
 	switch (args->event) {
 	case NB_EV_VALIDATE:
 		maxpaths = yang_dnode_get_uint16(args->dnode, NULL);
-		if (maxpaths > multipath_num) {
+		if (maxpaths > MULTIPATH_NUM) {
 			snprintf(args->errmsg, args->errmsg_len,
 				 "maxpaths %u is out of range %u", maxpaths,
-				 multipath_num);
+				 MULTIPATH_NUM);
 			return NB_ERR_VALIDATION;
 		}
 		break;