net/qede: limit ring size to 32k

[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 8d296fa..65dc75b 100644 (file)
--- a/drivers/net/bonding/rte_eth_bond_8023ad.c
+++ b/drivers/net/bonding/rte_eth_bond_8023ad.c
@@ -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) {
@@ -886,7 +886,10 @@ bond_mode_8023ad_activate_slave(struct rte_eth_dev *bond_dev, uint8_t slave_id)
 
        RTE_ASSERT(port->rx_ring == NULL);
        RTE_ASSERT(port->tx_ring == NULL);
-       socket_id = rte_eth_devices[slave_id].data->numa_node;
+
+       socket_id = rte_eth_dev_socket_id(slave_id);
+       if (socket_id == (int)LCORE_ID_ANY)
+               socket_id = rte_socket_id();
 
        element_size = sizeof(struct slow_protocol_frame) +
                                RTE_PKTMBUF_HEADROOM;