net: add rte prefix to ether functions

[dpdk.git] / examples / l2fwd-keepalive / main.c

diff --git a/examples/l2fwd-keepalive/main.c b/examples/l2fwd-keepalive/main.c
index 4f97cfb..9831a43 100644 (file)
--- a/examples/l2fwd-keepalive/main.c
+++ b/examples/l2fwd-keepalive/main.c
@@ -52,13 +52,13 @@
 /*
  * Configurable number of RX/TX ring descriptors
  */
-#define RTE_TEST_RX_DESC_DEFAULT 128
-#define RTE_TEST_TX_DESC_DEFAULT 512
+#define RTE_TEST_RX_DESC_DEFAULT 1024
+#define RTE_TEST_TX_DESC_DEFAULT 1024
 static uint16_t nb_rxd = RTE_TEST_RX_DESC_DEFAULT;
 static uint16_t nb_txd = RTE_TEST_TX_DESC_DEFAULT;
 
 /* ethernet addresses of ports */
-static struct ether_addr l2fwd_ports_eth_addr[RTE_MAX_ETHPORTS];
+static struct rte_ether_addr l2fwd_ports_eth_addr[RTE_MAX_ETHPORTS];
 
 /* mask of enabled ports */
 static uint32_t l2fwd_enabled_port_mask;
@@ -81,8 +81,6 @@ struct rte_eth_dev_tx_buffer *tx_buffer[RTE_MAX_ETHPORTS];
 static struct rte_eth_conf port_conf = {
        .rxmode = {
                .split_hdr_size = 0,
-               .ignore_offload_bitfield = 1,
-               .offloads = DEV_RX_OFFLOAD_CRC_STRIP,
        },
        .txmode = {
                .mq_mode = ETH_MQ_TX_NONE,
@@ -167,21 +165,21 @@ print_stats(__attribute__((unused)) struct rte_timer *ptr_timer,
 static void
 l2fwd_simple_forward(struct rte_mbuf *m, unsigned portid)
 {
-       struct ether_hdr *eth;
+       struct rte_ether_hdr *eth;
        void *tmp;
        int sent;
        unsigned dst_port;
        struct rte_eth_dev_tx_buffer *buffer;
 
        dst_port = l2fwd_dst_ports[portid];
-       eth = rte_pktmbuf_mtod(m, struct ether_hdr *);
+       eth = rte_pktmbuf_mtod(m, struct rte_ether_hdr *);
 
        /* 02:00:00:00:00:xx */
        tmp = &eth->d_addr.addr_bytes[0];
        *((uint64_t *)tmp) = 0x000000000002 + ((uint64_t)dst_port << 40);
 
        /* src addr */
-       ether_addr_copy(&l2fwd_ports_eth_addr[dst_port], &eth->s_addr);
+       rte_ether_addr_copy(&l2fwd_ports_eth_addr[dst_port], &eth->s_addr);
 
        buffer = tx_buffer[dst_port];
        sent = rte_eth_tx_buffer(dst_port, 0, buffer, m);
@@ -445,7 +443,7 @@ l2fwd_parse_args(int argc, char **argv)
 
 /* Check the link status of all ports in up to 9s, and print them finally */
 static void
-check_all_ports_link_status(uint16_t port_num, uint32_t port_mask)
+check_all_ports_link_status(uint32_t port_mask)
 {
 #define CHECK_INTERVAL 100 /* 100ms */
 #define MAX_CHECK_TIME 90 /* 9s (90 * 100ms) in total */
@@ -457,7 +455,7 @@ check_all_ports_link_status(uint16_t port_num, uint32_t port_mask)
        fflush(stdout);
        for (count = 0; count <= MAX_CHECK_TIME; count++) {
                all_ports_up = 1;
-               for (portid = 0; portid < port_num; portid++) {
+               RTE_ETH_FOREACH_DEV(portid) {
                        if ((port_mask & (1 << portid)) == 0)
                                continue;
                        memset(&link, 0, sizeof(link));
@@ -526,7 +524,7 @@ main(int argc, char **argv)
        struct lcore_queue_conf *qconf;
        int ret;
        uint16_t nb_ports;
-       uint16_t nb_ports_available;
+       uint16_t nb_ports_available = 0;
        uint16_t portid, last_port;
        unsigned lcore_id, rx_lcore_id;
        unsigned nb_ports_in_mask = 0;
@@ -561,7 +559,7 @@ main(int argc, char **argv)
        if (l2fwd_pktmbuf_pool == NULL)
                rte_exit(EXIT_FAILURE, "Cannot init mbuf pool\n");
 
-       nb_ports = rte_eth_dev_count();
+       nb_ports = rte_eth_dev_count_avail();
        if (nb_ports == 0)
                rte_exit(EXIT_FAILURE, "No Ethernet ports - bye\n");
 
@@ -573,7 +571,7 @@ main(int argc, char **argv)
        /*
         * Each logical core is assigned a dedicated TX queue on each port.
         */
-       for (portid = 0; portid < nb_ports; portid++) {
+       RTE_ETH_FOREACH_DEV(portid) {
                /* skip ports that are not enabled */
                if ((l2fwd_enabled_port_mask & (1 << portid)) == 0)
                        continue;
@@ -595,7 +593,7 @@ main(int argc, char **argv)
        qconf = NULL;
 
        /* Initialize the port/queue configuration of each logical core */
-       for (portid = 0; portid < nb_ports; portid++) {
+       RTE_ETH_FOREACH_DEV(portid) {
                /* skip ports that are not enabled */
                if ((l2fwd_enabled_port_mask & (1 << portid)) == 0)
                        continue;
@@ -619,10 +617,8 @@ main(int argc, char **argv)
                        rx_lcore_id, portid);
        }
 
-       nb_ports_available = nb_ports;
-
        /* Initialise each port */
-       for (portid = 0; portid < nb_ports; portid++) {
+       RTE_ETH_FOREACH_DEV(portid) {
                struct rte_eth_dev_info dev_info;
                struct rte_eth_rxconf rxq_conf;
                struct rte_eth_txconf txq_conf;
@@ -631,9 +627,10 @@ main(int argc, char **argv)
                /* skip ports that are not enabled */
                if ((l2fwd_enabled_port_mask & (1 << portid)) == 0) {
                        printf("Skipping disabled port %u\n", portid);
-                       nb_ports_available--;
                        continue;
                }
+               nb_ports_available++;
+
                /* init port */
                printf("Initializing port %u... ", portid);
                fflush(stdout);
@@ -672,7 +669,6 @@ main(int argc, char **argv)
                /* init one TX queue on each port */
                fflush(stdout);
                txq_conf = dev_info.default_txconf;
-               txq_conf.txq_flags = ETH_TXQ_FLAGS_IGNORE;
                txq_conf.offloads = local_port_conf.txmode.offloads;
                ret = rte_eth_tx_queue_setup(portid, 0, nb_txd,
                                rte_eth_dev_socket_id(portid),
@@ -728,7 +724,7 @@ main(int argc, char **argv)
                        "All available ports are disabled. Please set portmask.\n");
        }
 
-       check_all_ports_link_status(nb_ports, l2fwd_enabled_port_mask);
+       check_all_ports_link_status(l2fwd_enabled_port_mask);
 
        struct rte_timer hb_timer, stats_timer;