ethdev: use constants for link state

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

diff --git a/drivers/net/bonding/rte_eth_bond_api.c b/drivers/net/bonding/rte_eth_bond_api.c
index 484a6f3..e9247b5 100644 (file)
--- a/drivers/net/bonding/rte_eth_bond_api.c
+++ b/drivers/net/bonding/rte_eth_bond_api.c
@@ -205,7 +205,7 @@ rte_eth_bond_create(const char *name, uint8_t mode, uint8_t socket_id)
 
        TAILQ_INIT(&(eth_dev->link_intr_cbs));
 
-       eth_dev->data->dev_link.link_status = 0;
+       eth_dev->data->dev_link.link_status = ETH_LINK_DOWN;
 
        eth_dev->data->mac_addrs = rte_zmalloc_socket(name, ETHER_ADDR_LEN, 0,
                        socket_id);
@@ -231,7 +231,7 @@ rte_eth_bond_create(const char *name, uint8_t mode, uint8_t socket_id)
 
        internals->port_id = eth_dev->data->port_id;
        internals->mode = BONDING_MODE_INVALID;
-       internals->current_primary_port = 0;
+       internals->current_primary_port = RTE_MAX_ETHPORTS + 1;
        internals->balance_xmit_policy = BALANCE_XMIT_POLICY_LAYER2;
        internals->xmit_hash = xmit_l2_hash;
        internals->user_defined_mac = 0;
@@ -314,38 +314,23 @@ __eth_bond_slave_add_lock_free(uint8_t bonded_port_id, uint8_t slave_port_id)
 {
        struct rte_eth_dev *bonded_eth_dev, *slave_eth_dev;
        struct bond_dev_private *internals;
-       struct bond_dev_private *temp_internals;
        struct rte_eth_link link_props;
        struct rte_eth_dev_info dev_info;
 
-       int i, j;
-
        if (valid_slave_port_id(slave_port_id) != 0)
                return -1;
 
        bonded_eth_dev = &rte_eth_devices[bonded_port_id];
        internals = bonded_eth_dev->data->dev_private;
 
-       /* Verify that new slave device is not already a slave of another
-        * bonded device */
-       for (i = rte_eth_dev_count()-1; i >= 0; i--) {
-               if (check_for_bonded_ethdev(&rte_eth_devices[i]) == 0) {
-                       temp_internals = rte_eth_devices[i].data->dev_private;
-
-                       for (j = 0; j < temp_internals->slave_count; j++) {
-                               /* Device already a slave of a bonded device */
-                               if (temp_internals->slaves[j].port_id == slave_port_id) {
-                                       RTE_BOND_LOG(ERR, "Slave port %d is already a slave",
-                                                       slave_port_id);
-                                       return -1;
-                               }
-                       }
-               }
-       }
-
        slave_eth_dev = &rte_eth_devices[slave_port_id];
+       if (slave_eth_dev->data->dev_flags & RTE_ETH_DEV_BONDED_SLAVE) {
+               RTE_BOND_LOG(ERR, "Slave device is already a slave of a bonded device");
+               return -1;
+       }
 
        /* Add slave details to bonded device */
+       slave_eth_dev->data->dev_flags |= RTE_ETH_DEV_BONDED_SLAVE;
        slave_add(internals, slave_eth_dev);
 
        rte_eth_dev_info_get(slave_port_id, &dev_info);
@@ -367,6 +352,7 @@ __eth_bond_slave_add_lock_free(uint8_t bonded_port_id, uint8_t slave_port_id)
 
                /* Make primary slave */
                internals->primary_port = slave_port_id;
+               internals->current_primary_port = slave_port_id;
 
                /* Inherit queues settings from first slave */
                internals->nb_rx_queues = slave_eth_dev->data->nb_rx_queues;
@@ -385,6 +371,7 @@ __eth_bond_slave_add_lock_free(uint8_t bonded_port_id, uint8_t slave_port_id)
                if (internals->link_props_set) {
                        if (link_properties_valid(&(bonded_eth_dev->data->dev_link),
                                                                          &(slave_eth_dev->data->dev_link))) {
+                               slave_eth_dev->data->dev_flags &= (~RTE_ETH_DEV_BONDED_SLAVE);
                                RTE_BOND_LOG(ERR,
                                                "Slave port %d link speed/duplex not supported",
                                                slave_port_id);
@@ -416,6 +403,7 @@ __eth_bond_slave_add_lock_free(uint8_t bonded_port_id, uint8_t slave_port_id)
 
        if (bonded_eth_dev->data->dev_started) {
                if (slave_configure(bonded_eth_dev, slave_eth_dev) != 0) {
+                       slave_eth_dev->data->dev_flags &= (~RTE_ETH_DEV_BONDED_SLAVE);
                        RTE_BOND_LOG(ERR, "rte_bond_slaves_configure: port=%d",
                                        slave_port_id);
                        return -1;
@@ -432,8 +420,17 @@ __eth_bond_slave_add_lock_free(uint8_t bonded_port_id, uint8_t slave_port_id)
        if (bonded_eth_dev->data->dev_started) {
                rte_eth_link_get_nowait(slave_port_id, &link_props);
 
-                if (link_props.link_status == 1)
-                       activate_slave(bonded_eth_dev, slave_port_id);
+                if (link_props.link_status == ETH_LINK_UP) {
+                       if (internals->active_slave_count == 0 &&
+                           !internals->user_defined_primary_port)
+                               bond_ethdev_primary_set(internals,
+                                                       slave_port_id);
+
+                       if (find_slave_by_id(internals->active_slaves,
+                                            internals->active_slave_count,
+                                            slave_port_id) == internals->active_slave_count)
+                               activate_slave(bonded_eth_dev, slave_port_id);
+               }
        }
        return 0;
 
@@ -468,7 +465,7 @@ __eth_bond_slave_remove_lock_free(uint8_t bonded_port_id, uint8_t slave_port_id)
 {
        struct rte_eth_dev *bonded_eth_dev;
        struct bond_dev_private *internals;
-
+       struct rte_eth_dev *slave_eth_dev;
        int i, slave_idx;
 
        if (valid_slave_port_id(slave_port_id) != 0)
@@ -508,7 +505,9 @@ __eth_bond_slave_remove_lock_free(uint8_t bonded_port_id, uint8_t slave_port_id)
        mac_address_set(&rte_eth_devices[slave_port_id],
                        &(internals->slaves[slave_idx].persisted_mac_addr));
 
-       slave_remove(internals, &rte_eth_devices[slave_port_id]);
+       slave_eth_dev = &rte_eth_devices[slave_port_id];
+       slave_remove(internals, slave_eth_dev);
+       slave_eth_dev->data->dev_flags &= (~RTE_ETH_DEV_BONDED_SLAVE);
 
        /*  first slave in the active list will be the primary by default,
         *  otherwise use first device in list */