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 3d744e18bb621e71ad74939238860ba0a6267c24..a00fae340109e57467d5c27312ee50ab75a3f344 100644 (file)
--- 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;