net: add rte prefix to ether structures

[dpdk.git] / app / test-pmd / testpmd.c

diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index d01165f..2c736ec 100644 (file)
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -137,7 +137,7 @@ uint8_t txring_numa[RTE_MAX_ETHPORTS];
  * Must be instantiated with the ethernet addresses of peer traffic generator
  * ports.
  */
-struct ether_addr peer_eth_addrs[RTE_MAX_ETHPORTS];
+struct rte_ether_addr peer_eth_addrs[RTE_MAX_ETHPORTS];
 portid_t nb_peer_eth_addrs = 0;
 
 /*
@@ -2018,7 +2018,7 @@ start_port(portid_t pid)
        portid_t pi;
        queueid_t qi;
        struct rte_port *port;
-       struct ether_addr mac_addr;
+       struct rte_ether_addr mac_addr;
 
        if (port_id_is_invalid(pid, ENABLED_WARN))
                return 0;
@@ -2434,8 +2434,7 @@ detach_port_device(portid_t port_id)
                TESTPMD_LOG(ERR, "Failed to detach device %s\n", dev->name);
                return;
        }
-
-       RTE_ETH_FOREACH_DEV_SIBLING(sibling, port_id) {
+       RTE_ETH_FOREACH_DEV_OF(sibling, dev) {
                /* reset mapping between old ports and removed device */
                rte_eth_devices[sibling].device = NULL;
                if (ports[sibling].port_status != RTE_PORT_CLOSED) {
@@ -2810,9 +2809,12 @@ static void
 rxtx_port_config(struct rte_port *port)
 {
        uint16_t qid;
+       uint64_t offloads;
 
        for (qid = 0; qid < nb_rxq; qid++) {
+               offloads = port->rx_conf[qid].offloads;
                port->rx_conf[qid] = port->dev_info.default_rxconf;
+               port->rx_conf[qid].offloads |= offloads;
 
                /* Check if any Rx parameters have been passed */
                if (rx_pthresh != RTE_PMD_PARAM_UNSET)
@@ -2834,7 +2836,9 @@ rxtx_port_config(struct rte_port *port)
        }
 
        for (qid = 0; qid < nb_txq; qid++) {
+               offloads = port->tx_conf[qid].offloads;
                port->tx_conf[qid] = port->dev_info.default_txconf;
+               port->tx_conf[qid].offloads |= offloads;
 
                /* Check if any Tx parameters have been passed */
                if (tx_pthresh != RTE_PMD_PARAM_UNSET)