net/bonding: fix selection logic

[dpdk.git] / drivers / net / bonding / rte_eth_bond_8023ad.c

diff --git a/drivers/net/bonding/rte_eth_bond_8023ad.c b/drivers/net/bonding/rte_eth_bond_8023ad.c
index 7d8da2b..b77a37d 100644 (file)
--- a/drivers/net/bonding/rte_eth_bond_8023ad.c
+++ b/drivers/net/bonding/rte_eth_bond_8023ad.c
@@ -12,7 +12,7 @@
 #include <rte_cycles.h>
 #include <rte_compat.h>
 
-#include "rte_eth_bond_private.h"
+#include "eth_bond_private.h"
 
 static void bond_mode_8023ad_ext_periodic_cb(void *arg);
 #ifdef RTE_LIBRTE_BOND_DEBUG_8023AD
@@ -673,9 +673,8 @@ selection_logic(struct bond_dev_private *internals, uint16_t slave_id)
        uint64_t agg_bandwidth[RTE_MAX_ETHPORTS] = {0};
        uint64_t agg_count[RTE_MAX_ETHPORTS] = {0};
        uint16_t default_slave = 0;
-       uint16_t mode_count_id;
-       uint16_t mode_band_id;
        struct rte_eth_link link_info;
+       uint16_t agg_new_idx = 0;
        int ret;
 
        slaves = internals->active_slaves;
@@ -696,8 +695,8 @@ selection_logic(struct bond_dev_private *internals, uint16_t slave_id)
                                slaves[i], rte_strerror(-ret));
                        continue;
                }
-               agg_count[agg->aggregator_port_id] += 1;
-               agg_bandwidth[agg->aggregator_port_id] += link_info.link_speed;
+               agg_count[i] += 1;
+               agg_bandwidth[i] += link_info.link_speed;
 
                /* Actors system ID is not checked since all slave device have the same
                 * ID (MAC address). */
@@ -718,22 +717,22 @@ selection_logic(struct bond_dev_private *internals, uint16_t slave_id)
 
        switch (internals->mode4.agg_selection) {
        case AGG_COUNT:
-               mode_count_id = max_index(agg_count, slaves_count);
-               new_agg_id = mode_count_id;
+               agg_new_idx = max_index(agg_count, slaves_count);
+               new_agg_id = slaves[agg_new_idx];
                break;
        case AGG_BANDWIDTH:
-               mode_band_id = max_index(agg_bandwidth, slaves_count);
-               new_agg_id = mode_band_id;
+               agg_new_idx = max_index(agg_bandwidth, slaves_count);
+               new_agg_id = slaves[agg_new_idx];
                break;
        case AGG_STABLE:
                if (default_slave == slaves_count)
-                       new_agg_id = slave_id;
+                       new_agg_id = slaves[slave_id];
                else
                        new_agg_id = slaves[default_slave];
                break;
        default:
                if (default_slave == slaves_count)
-                       new_agg_id = slave_id;
+                       new_agg_id = slaves[slave_id];
                else
                        new_agg_id = slaves[default_slave];
                break;
@@ -1387,11 +1386,12 @@ rte_eth_bond_8023ad_agg_selection_set(uint16_t port_id,
        struct bond_dev_private *internals;
        struct mode8023ad_private *mode4;
 
+       if (valid_bonded_port_id(port_id) != 0)
+               return -EINVAL;
+
        bond_dev = &rte_eth_devices[port_id];
        internals = bond_dev->data->dev_private;
 
-       if (valid_bonded_port_id(port_id) != 0)
-               return -EINVAL;
        if (internals->mode != 4)
                return -EINVAL;
 
@@ -1408,11 +1408,12 @@ int rte_eth_bond_8023ad_agg_selection_get(uint16_t port_id)
        struct bond_dev_private *internals;
        struct mode8023ad_private *mode4;
 
+       if (valid_bonded_port_id(port_id) != 0)
+               return -EINVAL;
+
        bond_dev = &rte_eth_devices[port_id];
        internals = bond_dev->data->dev_private;
 
-       if (valid_bonded_port_id(port_id) != 0)
-               return -EINVAL;
        if (internals->mode != 4)
                return -EINVAL;
        mode4 = &internals->mode4;
@@ -1665,9 +1666,14 @@ int
 rte_eth_bond_8023ad_dedicated_queues_enable(uint16_t port)
 {
        int retval = 0;
-       struct rte_eth_dev *dev = &rte_eth_devices[port];
-       struct bond_dev_private *internals = (struct bond_dev_private *)
-               dev->data->dev_private;
+       struct rte_eth_dev *dev;
+       struct bond_dev_private *internals;
+
+       if (valid_bonded_port_id(port) != 0)
+               return -EINVAL;
+
+       dev = &rte_eth_devices[port];
+       internals = dev->data->dev_private;
 
        if (check_for_bonded_ethdev(dev) != 0)
                return -1;
@@ -1689,9 +1695,14 @@ int
 rte_eth_bond_8023ad_dedicated_queues_disable(uint16_t port)
 {
        int retval = 0;
-       struct rte_eth_dev *dev = &rte_eth_devices[port];
-       struct bond_dev_private *internals = (struct bond_dev_private *)
-               dev->data->dev_private;
+       struct rte_eth_dev *dev;
+       struct bond_dev_private *internals;
+
+       if (valid_bonded_port_id(port) != 0)
+               return -EINVAL;
+
+       dev = &rte_eth_devices[port];
+       internals = dev->data->dev_private;
 
        if (check_for_bonded_ethdev(dev) != 0)
                return -1;