New upstream version 16.11.5

[deb_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 48a50e4..eea6ccc 100644 (file)
--- a/drivers/net/bonding/rte_eth_bond_8023ad.c
+++ b/drivers/net/bonding/rte_eth_bond_8023ad.c
@@ -435,7 +435,7 @@ periodic_machine(struct bond_dev_private *internals, uint8_t slave_id)
                         * In other case (was fast and now it is slow) just switch
                         * timeout to slow without forcing send of LACP (because standard
                         * say so)*/
-                       if (!is_partner_fast)
+                       if (is_partner_fast)
                                SM_FLAG_SET(port, NTT);
                } else
                        return; /* Nothing changed */
@@ -758,7 +758,7 @@ bond_mode_8023ad_periodic_cb(void *arg)
                uint16_t key;
 
                slave_id = internals->active_slaves[i];
-               rte_eth_link_get(slave_id, &link_info);
+               rte_eth_link_get_nowait(slave_id, &link_info);
                rte_eth_macaddr_get(slave_id, &slave_addr);
 
                if (link_info.link_status != 0) {
@@ -934,37 +934,30 @@ bond_mode_8023ad_activate_slave(struct rte_eth_dev *bond_dev, uint8_t slave_id)
 }
 
 int
-bond_mode_8023ad_deactivate_slave(struct rte_eth_dev *bond_dev,
+bond_mode_8023ad_deactivate_slave(struct rte_eth_dev *bond_dev __rte_unused,
                uint8_t slave_id)
 {
-       struct bond_dev_private *internals = bond_dev->data->dev_private;
        void *pkt = NULL;
-       struct port *port;
-       uint8_t i;
+       struct port *port = NULL;
+       uint8_t old_partner_state;
 
-       /* Given slave must be in active list */
-       RTE_ASSERT(find_slave_by_id(internals->active_slaves,
-       internals->active_slave_count, slave_id) < internals->active_slave_count);
+       port = &mode_8023ad_ports[slave_id];
 
-       /* Exclude slave from transmit policy. If this slave is an aggregator
-        * make all aggregated slaves unselected to force selection logic
-        * to select suitable aggregator for this port. */
-       for (i = 0; i < internals->active_slave_count; i++) {
-               port = &mode_8023ad_ports[internals->active_slaves[i]];
-               if (port->aggregator_port_id != slave_id)
-                       continue;
+       ACTOR_STATE_CLR(port, AGGREGATION);
+       port->selected = UNSELECTED;
 
-               port->selected = UNSELECTED;
+       old_partner_state = port->partner_state;
+       record_default(port);
 
-               /* Use default aggregator */
-               port->aggregator_port_id = internals->active_slaves[i];
-       }
+       /* If partner timeout state changes then disable timer */
+       if (!((old_partner_state ^ port->partner_state) &
+                       STATE_LACP_SHORT_TIMEOUT))
+               timer_cancel(&port->current_while_timer);
 
-       port = &mode_8023ad_ports[slave_id];
-       port->selected = UNSELECTED;
-       port->actor_state &= ~(STATE_SYNCHRONIZATION | STATE_DISTRIBUTING |
-                       STATE_COLLECTING);
+       PARTNER_STATE_CLR(port, AGGREGATION);
+       ACTOR_STATE_CLR(port, EXPIRED);
 
+       /* flush rx/tx rings */
        while (rte_ring_dequeue(port->rx_ring, &pkt) == 0)
                rte_pktmbuf_free((struct rte_mbuf *)pkt);
 
@@ -1068,7 +1061,7 @@ bond_mode_8023ad_conf_assign(struct mode8023ad_private *mode4,
 }
 
 static void
-bond_mode_8023ad_setup_v1604(struct rte_eth_dev *dev,
+bond_mode_8023ad_setup_v20(struct rte_eth_dev *dev,
                struct rte_eth_bond_8023ad_conf *conf)
 {
        struct rte_eth_bond_8023ad_conf def_conf;
@@ -1116,7 +1109,8 @@ bond_mode_8023ad_enable(struct rte_eth_dev *bond_dev)
        uint8_t i;
 
        for (i = 0; i < internals->active_slave_count; i++)
-               bond_mode_8023ad_activate_slave(bond_dev, i);
+               bond_mode_8023ad_activate_slave(bond_dev,
+                               internals->active_slaves[i]);
 
        return 0;
 }
@@ -1214,7 +1208,7 @@ free_out:
 }
 
 int
-rte_eth_bond_8023ad_conf_get_v1604(uint8_t port_id,
+rte_eth_bond_8023ad_conf_get_v20(uint8_t port_id,
                struct rte_eth_bond_8023ad_conf *conf)
 {
        struct rte_eth_dev *bond_dev;
@@ -1229,7 +1223,7 @@ rte_eth_bond_8023ad_conf_get_v1604(uint8_t port_id,
        bond_mode_8023ad_conf_get(bond_dev, conf);
        return 0;
 }
-VERSION_SYMBOL(rte_eth_bond_8023ad_conf_get, _v1604, 16.04);
+VERSION_SYMBOL(rte_eth_bond_8023ad_conf_get, _v20, 2.0);
 
 int
 rte_eth_bond_8023ad_conf_get_v1607(uint8_t port_id,
@@ -1278,7 +1272,7 @@ bond_8023ad_setup_validate(uint8_t port_id,
 }
 
 int
-rte_eth_bond_8023ad_setup_v1604(uint8_t port_id,
+rte_eth_bond_8023ad_setup_v20(uint8_t port_id,
                struct rte_eth_bond_8023ad_conf *conf)
 {
        struct rte_eth_dev *bond_dev;
@@ -1289,11 +1283,11 @@ rte_eth_bond_8023ad_setup_v1604(uint8_t port_id,
                return err;
 
        bond_dev = &rte_eth_devices[port_id];
-       bond_mode_8023ad_setup_v1604(bond_dev, conf);
+       bond_mode_8023ad_setup_v20(bond_dev, conf);
 
        return 0;
 }
-VERSION_SYMBOL(rte_eth_bond_8023ad_setup, _v1604, 16.04);
+VERSION_SYMBOL(rte_eth_bond_8023ad_setup, _v20, 2.0);
 
 int
 rte_eth_bond_8023ad_setup_v1607(uint8_t port_id,