net/bonding: delete redundant code

[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 05b3004..b24a446 100644 (file)
--- a/drivers/net/bonding/rte_eth_bond_8023ad.c
+++ b/drivers/net/bonding/rte_eth_bond_8023ad.c
@@ -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;
@@ -799,7 +798,8 @@ rx_machine_update(struct bond_dev_private *internals, uint16_t slave_id,
                RTE_ASSERT(lacp->lacpdu.subtype == SLOW_SUBTYPE_LACP);
 
                partner = &lacp->lacpdu.partner;
-               if (rte_is_same_ether_addr(&partner->port_params.system,
+               if (rte_is_zero_ether_addr(&partner->port_params.system) ||
+                       rte_is_same_ether_addr(&partner->port_params.system,
                        &internals->mode4.mac_addr)) {
                        /* This LACP frame is sending to the bonding port
                         * so pass it to rx_machine.
@@ -1044,7 +1044,7 @@ bond_mode_8023ad_activate_slave(struct rte_eth_dev *bond_dev,
        RTE_ASSERT(port->tx_ring == NULL);
 
        socket_id = rte_eth_dev_socket_id(slave_id);
-       if (socket_id == (int)LCORE_ID_ANY)
+       if (socket_id == -1)
                socket_id = rte_socket_id();
 
        element_size = sizeof(struct slow_protocol_frame) +
@@ -1676,9 +1676,6 @@ rte_eth_bond_8023ad_dedicated_queues_enable(uint16_t port)
        dev = &rte_eth_devices[port];
        internals = dev->data->dev_private;
 
-       if (check_for_bonded_ethdev(dev) != 0)
-               return -1;
-
        if (bond_8023ad_slow_pkt_hw_filter_supported(port) != 0)
                return -1;
 
@@ -1705,9 +1702,6 @@ rte_eth_bond_8023ad_dedicated_queues_disable(uint16_t port)
        dev = &rte_eth_devices[port];
        internals = dev->data->dev_private;
 
-       if (check_for_bonded_ethdev(dev) != 0)
-               return -1;
-
        /* Device must be stopped to set up slow queue */
        if (dev->data->dev_started)
                return -1;