diff options
| author | Russ White <russ@riw.us> | 2018-06-08 07:06:19 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-08 07:06:19 -0400 |
| commit | e78f9d0137e4f0fa783e282bae9bad15d5bd3ec2 (patch) | |
| tree | c8a34e9958554c39de777fe3682be317e4c3e96f /pimd/pim_nht.c | |
| parent | c4a81cae7e9838925c52dffa80478239e1951bd5 (diff) | |
| parent | 4795fff748d6b55479b60013fd2dc8fdf8b4c7c2 (diff) | |
Merge pull request #2380 from donaldsharp/pim_stuff
pimd: Fix ecmp_enable and ecmp_rebalance_enable
Diffstat (limited to 'pimd/pim_nht.c')
| -rw-r--r-- | pimd/pim_nht.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pimd/pim_nht.c b/pimd/pim_nht.c index 5ca57c0406..1248363a6b 100644 --- a/pimd/pim_nht.c +++ b/pimd/pim_nht.c @@ -449,7 +449,7 @@ int pim_ecmp_nexthop_search(struct pim_instance *pim, metric is less than nexthop update. */ - if (qpim_ecmp_rebalance_enable == 0) { + if (pim->ecmp_rebalance_enable == 0) { uint8_t curr_route_valid = 0; // Check if current nexthop is present in new updated // Nexthop list. @@ -499,7 +499,7 @@ int pim_ecmp_nexthop_search(struct pim_instance *pim, } } } - if (qpim_ecmp_enable) { + if (pim->ecmp_enable) { // PIM ECMP flag is enable then choose ECMP path. hash_val = pim_compute_ecmp_hash(src, grp); mod_val = hash_val % pnc->nexthop_num; @@ -586,7 +586,7 @@ int pim_ecmp_nexthop_search(struct pim_instance *pim, "%s: (%s,%s)(%s) selected nhop interface %s addr %s mod_val %u iter %d ecmp %d", __PRETTY_FUNCTION__, buf2, buf3, pim->vrf->name, ifp->name, buf, mod_val, - nh_iter, qpim_ecmp_enable); + nh_iter, pim->ecmp_enable); } } nh_iter++; @@ -808,7 +808,7 @@ int pim_ecmp_nexthop_lookup(struct pim_instance *pim, } // If PIM ECMP enable then choose ECMP path. - if (qpim_ecmp_enable) { + if (pim->ecmp_enable) { hash_val = pim_compute_ecmp_hash(src, grp); mod_val = hash_val % num_ifindex; if (PIM_DEBUG_PIM_NHT_DETAIL) @@ -942,7 +942,7 @@ int pim_ecmp_fib_lookup_if_vif_index(struct pim_instance *pim, } // If PIM ECMP enable then choose ECMP path. - if (qpim_ecmp_enable) { + if (pim->ecmp_enable) { hash_val = pim_compute_ecmp_hash(src, grp); mod_val = hash_val % num_ifindex; if (PIM_DEBUG_PIM_NHT_DETAIL) |