net: add rte prefix to IP defines

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

diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index 2e99d99..0148b0a 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;
 
 /*
@@ -413,7 +413,8 @@ lcoreid_t latencystats_lcore_id = -1;
  * Ethernet device configuration.
  */
 struct rte_eth_rxmode rx_mode = {
-       .max_rx_pkt_len = ETHER_MAX_LEN, /**< Default maximum frame length. */
+       .max_rx_pkt_len = RTE_ETHER_MAX_LEN,
+               /**< Default maximum frame length. */
 };
 
 struct rte_eth_txmode tx_mode = {
@@ -479,8 +480,8 @@ struct vxlan_encap_conf vxlan_encap_conf = {
        .vni = "\x00\x00\x00",
        .udp_src = 0,
        .udp_dst = RTE_BE16(4789),
-       .ipv4_src = IPv4(127, 0, 0, 1),
-       .ipv4_dst = IPv4(255, 255, 255, 255),
+       .ipv4_src = RTE_IPv4(127, 0, 0, 1),
+       .ipv4_dst = RTE_IPv4(255, 255, 255, 255),
        .ipv6_src = "\x00\x00\x00\x00\x00\x00\x00\x00"
                "\x00\x00\x00\x00\x00\x00\x00\x01",
        .ipv6_dst = "\x00\x00\x00\x00\x00\x00\x00\x00"
@@ -496,8 +497,8 @@ struct nvgre_encap_conf nvgre_encap_conf = {
        .select_ipv4 = 1,
        .select_vlan = 0,
        .tni = "\x00\x00\x00",
-       .ipv4_src = IPv4(127, 0, 0, 1),
-       .ipv4_dst = IPv4(255, 255, 255, 255),
+       .ipv4_src = RTE_IPv4(127, 0, 0, 1),
+       .ipv4_dst = RTE_IPv4(255, 255, 255, 255),
        .ipv6_src = "\x00\x00\x00\x00\x00\x00\x00\x00"
                "\x00\x00\x00\x00\x00\x00\x00\x01",
        .ipv6_dst = "\x00\x00\x00\x00\x00\x00\x00\x00"
@@ -526,7 +527,7 @@ static void dev_event_callback(const char *device_name,
 static int all_ports_started(void);
 
 struct gso_status gso_ports[RTE_MAX_ETHPORTS];
-uint16_t gso_max_segment_size = ETHER_MAX_LEN - ETHER_CRC_LEN;
+uint16_t gso_max_segment_size = RTE_ETHER_MAX_LEN - RTE_ETHER_CRC_LEN;
 
 /*
  * Helper function to check if socket is already discovered.
@@ -582,7 +583,7 @@ set_def_peer_eth_addrs(void)
        portid_t i;
 
        for (i = 0; i < RTE_MAX_ETHPORTS; i++) {
-               peer_eth_addrs[i].addr_bytes[0] = ETHER_LOCAL_ADMIN_ADDR;
+               peer_eth_addrs[i].addr_bytes[0] = RTE_ETHER_LOCAL_ADMIN_ADDR;
                peer_eth_addrs[i].addr_bytes[5] = i;
        }
 }
@@ -1223,8 +1224,8 @@ init_config(void)
                fwd_lcores[lc_id]->gso_ctx.direct_pool = mbp;
                fwd_lcores[lc_id]->gso_ctx.indirect_pool = mbp;
                fwd_lcores[lc_id]->gso_ctx.gso_types = gso_types;
-               fwd_lcores[lc_id]->gso_ctx.gso_size = ETHER_MAX_LEN -
-                       ETHER_CRC_LEN;
+               fwd_lcores[lc_id]->gso_ctx.gso_size = RTE_ETHER_MAX_LEN -
+                       RTE_ETHER_CRC_LEN;
                fwd_lcores[lc_id]->gso_ctx.flag = 0;
        }
 
@@ -2018,7 +2019,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 +2435,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 +2810,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 +2837,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)
@@ -3037,8 +3042,9 @@ init_port_dcb_config(portid_t pid,
        port_conf.rxmode.offloads |= DEV_RX_OFFLOAD_VLAN_FILTER;
 
        /* re-configure the device . */
-       rte_eth_dev_configure(pid, nb_rxq, nb_rxq, &port_conf);
-
+       retval = rte_eth_dev_configure(pid, nb_rxq, nb_rxq, &port_conf);
+       if (retval < 0)
+               return retval;
        rte_eth_dev_info_get(pid, &rte_port->dev_info);
 
        /* If dev_info.vmdq_pool_base is greater than 0,