net: add rte prefix to ether structures

[dpdk.git] / examples / link_status_interrupt / main.c

diff --git a/examples/link_status_interrupt/main.c b/examples/link_status_interrupt/main.c
index 87b90b3..9997c58 100644 (file)
--- a/examples/link_status_interrupt/main.c
+++ b/examples/link_status_interrupt/main.c
@@ -47,13 +47,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 lsi_ports_eth_addr[RTE_MAX_ETHPORTS];
+static struct rte_ether_addr lsi_ports_eth_addr[RTE_MAX_ETHPORTS];
 
 /* mask of enabled ports */
 static uint32_t lsi_enabled_port_mask = 0;
@@ -76,14 +76,9 @@ struct lcore_queue_conf lcore_queue_conf[RTE_MAX_LCORE];
 
 struct rte_eth_dev_tx_buffer *tx_buffer[RTE_MAX_ETHPORTS];
 
-static const struct rte_eth_conf port_conf = {
+static struct rte_eth_conf port_conf = {
        .rxmode = {
                .split_hdr_size = 0,
-               .header_split   = 0, /**< Header Split disabled */
-               .hw_ip_checksum = 0, /**< IP checksum offload disabled */
-               .hw_vlan_filter = 0, /**< VLAN filtering disabled */
-               .jumbo_frame    = 0, /**< Jumbo Frame Support disabled */
-               .hw_strip_crc   = 1, /**< CRC stripped by hardware */
        },
        .txmode = {
                .mq_mode = ETH_MQ_TX_NONE,
@@ -168,13 +163,13 @@ print_stats(void)
 static void
 lsi_simple_forward(struct rte_mbuf *m, unsigned portid)
 {
-       struct ether_hdr *eth;
+       struct rte_ether_hdr *eth;
        void *tmp;
        unsigned dst_port = lsi_dst_ports[portid];
        int sent;
        struct rte_eth_dev_tx_buffer *buffer;
 
-       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];
@@ -520,7 +515,6 @@ int
 main(int argc, char **argv)
 {
        struct lcore_queue_conf *qconf;
-       struct rte_eth_dev_info dev_info;
        int ret;
        uint16_t nb_ports;
        uint16_t portid, portid_last = 0;
@@ -546,7 +540,7 @@ main(int argc, char **argv)
        if (lsi_pktmbuf_pool == NULL)
                rte_panic("Cannot init mbuf pool\n");
 
-       nb_ports = rte_eth_dev_count();
+       nb_ports = rte_eth_dev_count_avail();
        if (nb_ports == 0)
                rte_panic("No Ethernet port - bye\n");
 
@@ -567,8 +561,6 @@ main(int argc, char **argv)
                        portid_last = portid;
 
                nb_ports_in_mask++;
-
-               rte_eth_dev_info_get(portid, &dev_info);
        }
        if (nb_ports_in_mask < 2 || nb_ports_in_mask % 2)
                rte_exit(EXIT_FAILURE, "Current enabled port number is %u, "
@@ -604,6 +596,11 @@ main(int argc, char **argv)
 
        /* Initialise each port */
        for (portid = 0; portid < nb_ports; portid++) {
+               struct rte_eth_rxconf rxq_conf;
+               struct rte_eth_txconf txq_conf;
+               struct rte_eth_conf local_port_conf = port_conf;
+               struct rte_eth_dev_info dev_info;
+
                /* skip ports that are not enabled */
                if ((lsi_enabled_port_mask & (1 << portid)) == 0) {
                        printf("Skipping disabled port %u\n", (unsigned) portid);
@@ -612,7 +609,11 @@ main(int argc, char **argv)
                /* init port */
                printf("Initializing port %u... ", (unsigned) portid);
                fflush(stdout);
-               ret = rte_eth_dev_configure(portid, 1, 1, &port_conf);
+               rte_eth_dev_info_get(portid, &dev_info);
+               if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_MBUF_FAST_FREE)
+                       local_port_conf.txmode.offloads |=
+                               DEV_TX_OFFLOAD_MBUF_FAST_FREE;
+               ret = rte_eth_dev_configure(portid, 1, 1, &local_port_conf);
                if (ret < 0)
                        rte_exit(EXIT_FAILURE, "Cannot configure device: err=%d, port=%u\n",
                                  ret, (unsigned) portid);
@@ -637,9 +638,11 @@ main(int argc, char **argv)
 
                /* init one RX queue */
                fflush(stdout);
+               rxq_conf = dev_info.default_rxconf;
+               rxq_conf.offloads = local_port_conf.rxmode.offloads;
                ret = rte_eth_rx_queue_setup(portid, 0, nb_rxd,
                                             rte_eth_dev_socket_id(portid),
-                                            NULL,
+                                            &rxq_conf,
                                             lsi_pktmbuf_pool);
                if (ret < 0)
                        rte_exit(EXIT_FAILURE, "rte_eth_rx_queue_setup: err=%d, port=%u\n",
@@ -647,9 +650,11 @@ main(int argc, char **argv)
 
                /* init one TX queue logical core on each port */
                fflush(stdout);
+               txq_conf = dev_info.default_txconf;
+               txq_conf.offloads = local_port_conf.txmode.offloads;
                ret = rte_eth_tx_queue_setup(portid, 0, nb_txd,
                                rte_eth_dev_socket_id(portid),
-                               NULL);
+                               &txq_conf);
                if (ret < 0)
                        rte_exit(EXIT_FAILURE, "rte_eth_tx_queue_setup: err=%d,port=%u\n",
                                  ret, (unsigned) portid);