diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-08-10 19:13:19 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-10 19:13:19 -0400 |
| commit | 72faaf794622ce8786f0c80bb913cb16ab44d23b (patch) | |
| tree | fa82b7fdcfe9dae498ad9050458a5c73c61e2a76 /eigrpd/eigrp_network.c | |
| parent | 44fe86a340b5e79d244eb0bbd59d191b03a600fa (diff) | |
| parent | b1968f83da6e5a6d865d09dcb59a0ec7b89c0f43 (diff) | |
Merge pull request #956 from lunn/eigrpd-bandwidth
eigrpd: fix spelling of "bandwidth"
Diffstat (limited to 'eigrpd/eigrp_network.c')
| -rw-r--r-- | eigrpd/eigrp_network.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/eigrpd/eigrp_network.c b/eigrpd/eigrp_network.c index 80610e04a7..ec8806750b 100644 --- a/eigrpd/eigrp_network.c +++ b/eigrpd/eigrp_network.c @@ -392,9 +392,9 @@ u_int32_t eigrp_calculate_metrics(struct eigrp *eigrp, // {K1*BW+[(K2*BW)/(256-load)]+(K3*delay)}*{K5/(reliability+K4)} if (eigrp->k_values[0]) - temp_metric += (eigrp->k_values[0] * metric.bandwith); + temp_metric += (eigrp->k_values[0] * metric.bandwidth); if (eigrp->k_values[1]) - temp_metric += ((eigrp->k_values[1] * metric.bandwith) + temp_metric += ((eigrp->k_values[1] * metric.bandwidth) / (256 - metric.load)); if (eigrp->k_values[2]) temp_metric += (eigrp->k_values[2] * metric.delay); @@ -425,9 +425,9 @@ u_int32_t eigrp_calculate_total_metrics(struct eigrp *eigrp, u_int32_t bw = eigrp_bandwidth_to_scaled(EIGRP_IF_PARAM(entry->ei, bandwidth)); - entry->total_metric.bandwith = entry->total_metric.bandwith > bw + entry->total_metric.bandwidth = entry->total_metric.bandwidth > bw ? bw - : entry->total_metric.bandwith; + : entry->total_metric.bandwidth; return eigrp_calculate_metrics(eigrp, entry->total_metric); } @@ -435,7 +435,7 @@ u_int32_t eigrp_calculate_total_metrics(struct eigrp *eigrp, u_char eigrp_metrics_is_same(struct eigrp_metrics metric1, struct eigrp_metrics metric2) { - if ((metric1.bandwith == metric2.bandwith) + if ((metric1.bandwidth == metric2.bandwidth) && (metric1.delay == metric2.delay) && (metric1.hop_count == metric2.hop_count) && (metric1.load == metric2.load) |