examples/ipsec-secgw: support event Rx adapter

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

diff --git a/examples/vmdq/main.c b/examples/vmdq/main.c
index 5195a51..0111109 100644 (file)
--- a/examples/vmdq/main.c
+++ b/examples/vmdq/main.c
@@ -169,7 +169,13 @@ port_init(uint16_t port, struct rte_mempool *mbuf_pool)
         * The max pool number from dev_info will be used to validate the pool
         * number specified in cmd line
         */
-       rte_eth_dev_info_get(port, &dev_info);
+       retval = rte_eth_dev_info_get(port, &dev_info);
+       if (retval != 0) {
+               printf("Error during getting device (port %u) info: %s\n",
+                               port, strerror(-retval));
+               return retval;
+       }
+
        max_nb_pools = (uint32_t)dev_info.max_vmdq_pools;
        /*
         * We allow to process part of VMDQ pools specified by num_pools in
@@ -214,7 +220,13 @@ port_init(uint16_t port, struct rte_mempool *mbuf_pool)
        rxRings = (uint16_t)dev_info.max_rx_queues;
        txRings = (uint16_t)dev_info.max_tx_queues;
 
-       rte_eth_dev_info_get(port, &dev_info);
+       retval = rte_eth_dev_info_get(port, &dev_info);
+       if (retval != 0) {
+               printf("Error during getting device (port %u) info: %s\n",
+                               port, strerror(-retval));
+               return retval;
+       }
+
        if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_MBUF_FAST_FREE)
                port_conf.txmode.offloads |=
                        DEV_TX_OFFLOAD_MBUF_FAST_FREE;
@@ -264,7 +276,12 @@ port_init(uint16_t port, struct rte_mempool *mbuf_pool)
                return retval;
        }
 
-       rte_eth_macaddr_get(port, &vmdq_ports_eth_addr[port]);
+       retval = rte_eth_macaddr_get(port, &vmdq_ports_eth_addr[port]);
+       if (retval < 0) {
+               printf("port %d MAC address get failed: %s\n", port,
+                      rte_strerror(-retval));
+               return retval;
+       }
        printf("Port %u MAC: %02"PRIx8" %02"PRIx8" %02"PRIx8
                        " %02"PRIx8" %02"PRIx8" %02"PRIx8"\n",
                        (unsigned)port,
@@ -417,7 +434,7 @@ update_mac_address(struct rte_mbuf *m, unsigned dst_port)
        *((uint64_t *)tmp) = 0x000000000002 + ((uint64_t)dst_port << 40);
 
        /* src addr */
-       ether_addr_copy(&vmdq_ports_eth_addr[dst_port], &eth->s_addr);
+       rte_ether_addr_copy(&vmdq_ports_eth_addr[dst_port], &eth->s_addr);
 }
 
 /* When we receive a HUP signal, print out our stats */
@@ -486,7 +503,7 @@ lcore_main(__attribute__((__unused__)) void *dummy)
 
        for (;;) {
                struct rte_mbuf *buf[MAX_PKT_BURST];
-               const uint16_t buf_size = sizeof(buf) / sizeof(buf[0]);
+               const uint16_t buf_size = RTE_DIM(buf);
 
                for (p = 0; p < num_ports; p++) {
                        const uint8_t sport = ports[p];