net: add rte prefix to ether structures

[dpdk.git] / examples / ethtool / ethtool-app / main.c

diff --git a/examples/ethtool/ethtool-app/main.c b/examples/ethtool/ethtool-app/main.c
index 702feab..27c22cf 100644 (file)
--- a/examples/ethtool/ethtool-app/main.c
+++ b/examples/ethtool/ethtool-app/main.c
@@ -32,7 +32,7 @@ struct txq_port {
 };
 
 struct app_port {
-       struct ether_addr mac_addr;
+       struct rte_ether_addr mac_addr;
        struct txq_port txq;
        rte_spinlock_t lock;
        int port_active;
@@ -95,11 +95,9 @@ static void setup_ports(struct app_config *app_cfg, int cnt_ports)
        char str_name[16];
        uint16_t nb_rxd = PORT_RX_QUEUE_SIZE;
        uint16_t nb_txd = PORT_TX_QUEUE_SIZE;
-       struct rte_eth_txconf txconf;
 
        memset(&cfg_port, 0, sizeof(cfg_port));
        cfg_port.txmode.mq_mode = ETH_MQ_TX_NONE;
-       cfg_port.rxmode.ignore_offload_bitfield = 1;
 
        for (idx_port = 0; idx_port < cnt_ports; idx_port++) {
                struct app_port *ptr_port = &app_cfg->ports[idx_port];
@@ -141,11 +139,9 @@ static void setup_ports(struct app_config *app_cfg, int cnt_ports)
                        rte_exit(EXIT_FAILURE,
                                 "rte_eth_rx_queue_setup failed"
                                );
-               txconf = dev_info.default_txconf;
-               txconf.txq_flags = ETH_TXQ_FLAGS_IGNORE;
                if (rte_eth_tx_queue_setup(
                            idx_port, 0, nb_txd,
-                           rte_eth_dev_socket_id(idx_port), &txconf) < 0)
+                           rte_eth_dev_socket_id(idx_port), NULL) < 0)
                        rte_exit(EXIT_FAILURE,
                                 "rte_eth_tx_queue_setup failed"
                                );
@@ -162,9 +158,9 @@ static void setup_ports(struct app_config *app_cfg, int cnt_ports)
 static void process_frame(struct app_port *ptr_port,
        struct rte_mbuf *ptr_frame)
 {
-       struct ether_hdr *ptr_mac_hdr;
+       struct rte_ether_hdr *ptr_mac_hdr;
 
-       ptr_mac_hdr = rte_pktmbuf_mtod(ptr_frame, struct ether_hdr *);
+       ptr_mac_hdr = rte_pktmbuf_mtod(ptr_frame, struct rte_ether_hdr *);
        ether_addr_copy(&ptr_mac_hdr->s_addr, &ptr_mac_hdr->d_addr);
        ether_addr_copy(&ptr_port->mac_addr, &ptr_mac_hdr->s_addr);
 }
@@ -251,7 +247,7 @@ int main(int argc, char **argv)
        if (cnt_args_parsed < 0)
                rte_exit(EXIT_FAILURE, "rte_eal_init(): Failed");
 
-       cnt_ports = rte_eth_dev_count();
+       cnt_ports = rte_eth_dev_count_avail();
        printf("Number of NICs: %i\n", cnt_ports);
        if (cnt_ports == 0)
                rte_exit(EXIT_FAILURE, "No available NIC ports!\n");