replace alignment attributes

[dpdk.git] / examples / multi_process / symmetric_mp / main.c

diff --git a/examples/multi_process/symmetric_mp/main.c b/examples/multi_process/symmetric_mp/main.c
index c6c6a53..522f211 100644 (file)
--- a/examples/multi_process/symmetric_mp/main.c
+++ b/examples/multi_process/symmetric_mp/main.c
@@ -66,7 +66,7 @@ struct port_stats{
        unsigned rx;
        unsigned tx;
        unsigned drop;
-} __attribute__((aligned(RTE_CACHE_LINE_SIZE / 2)));
+} __rte_aligned(RTE_CACHE_LINE_SIZE / 2);
 
 static int proc_id = -1;
 static unsigned num_procs = 0;
@@ -178,8 +178,7 @@ smp_port_init(uint16_t port, struct rte_mempool *mbuf_pool,
                        .rxmode = {
                                .mq_mode        = ETH_MQ_RX_RSS,
                                .split_hdr_size = 0,
-                               .offloads = (DEV_RX_OFFLOAD_CHECKSUM |
-                                            DEV_RX_OFFLOAD_CRC_STRIP),
+                               .offloads = DEV_RX_OFFLOAD_CHECKSUM,
                        },
                        .rx_adv_conf = {
                                .rss_conf = {
@@ -210,7 +209,13 @@ smp_port_init(uint16_t port, struct rte_mempool *mbuf_pool,
        printf("# Initialising port %u... ", port);
        fflush(stdout);
 
-       rte_eth_dev_info_get(port, &info);
+       retval = rte_eth_dev_info_get(port, &info);
+       if (retval != 0) {
+               printf("Error during getting device (port %u) info: %s\n",
+                               port, strerror(-retval));
+               return retval;
+       }
+
        info.default_rxconf.rx_drop_en = 1;
 
        if (info.tx_offload_capa & DEV_TX_OFFLOAD_MBUF_FAST_FREE)
@@ -256,7 +261,9 @@ smp_port_init(uint16_t port, struct rte_mempool *mbuf_pool,
                        return retval;
        }
 
-       rte_eth_promiscuous_enable(port);
+       retval = rte_eth_promiscuous_enable(port);
+       if (retval != 0)
+               return retval;
 
        retval  = rte_eth_dev_start(port);
        if (retval < 0)
@@ -272,7 +279,7 @@ static void
 assign_ports_to_cores(void)
 {
 
-       const unsigned lcores = rte_eal_get_configuration()->lcore_count;
+       const unsigned int lcores = rte_lcore_count();
        const unsigned port_pairs = num_ports / 2;
        const unsigned pairs_per_lcore = port_pairs / lcores;
        unsigned extra_pairs = port_pairs % lcores;
@@ -357,6 +364,7 @@ check_all_ports_link_status(uint16_t port_num, uint32_t port_mask)
        uint16_t portid;
        uint8_t count, all_ports_up, print_flag = 0;
        struct rte_eth_link link;
+       int ret;
 
        printf("\nChecking link status");
        fflush(stdout);
@@ -366,7 +374,14 @@ check_all_ports_link_status(uint16_t port_num, uint32_t port_mask)
                        if ((port_mask & (1 << portid)) == 0)
                                continue;
                        memset(&link, 0, sizeof(link));
-                       rte_eth_link_get_nowait(portid, &link);
+                       ret = rte_eth_link_get_nowait(portid, &link);
+                       if (ret < 0) {
+                               all_ports_up = 0;
+                               if (print_flag == 1)
+                                       printf("Port %u link get failed: %s\n",
+                                               portid, rte_strerror(-ret));
+                               continue;
+                       }
                        /* print link status if flag set */
                        if (print_flag == 1) {
                                if (link.link_status)