net/ena: support xstat names by ID
[dpdk.git] / examples / bond / main.c
index fd8fd76..335bde5 100644 (file)
@@ -114,17 +114,17 @@ static struct rte_mempool *mbuf_pool;
 
 static struct rte_eth_conf port_conf = {
        .rxmode = {
-               .mq_mode = ETH_MQ_RX_NONE,
+               .mq_mode = RTE_ETH_MQ_RX_NONE,
                .split_hdr_size = 0,
        },
        .rx_adv_conf = {
                .rss_conf = {
                        .rss_key = NULL,
-                       .rss_hf = ETH_RSS_IP,
+                       .rss_hf = RTE_ETH_RSS_IP,
                },
        },
        .txmode = {
-               .mq_mode = ETH_MQ_TX_NONE,
+               .mq_mode = RTE_ETH_MQ_TX_NONE,
        },
 };
 
@@ -148,9 +148,9 @@ slave_port_init(uint16_t portid, struct rte_mempool *mbuf_pool)
                        "Error during getting device (port %u) info: %s\n",
                        portid, strerror(-retval));
 
-       if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_MBUF_FAST_FREE)
+       if (dev_info.tx_offload_capa & RTE_ETH_TX_OFFLOAD_MBUF_FAST_FREE)
                local_port_conf.txmode.offloads |=
-                       DEV_TX_OFFLOAD_MBUF_FAST_FREE;
+                       RTE_ETH_TX_OFFLOAD_MBUF_FAST_FREE;
 
        local_port_conf.rx_adv_conf.rss_conf.rss_hf &=
                dev_info.flow_type_rss_offloads;
@@ -230,7 +230,7 @@ bond_port_init(struct rte_mempool *mbuf_pool)
                        0 /*SOCKET_ID_ANY*/);
        if (retval < 0)
                rte_exit(EXIT_FAILURE,
-                               "Faled to create bond port\n");
+                               "Failed to create bond port\n");
 
        BOND_PORT = retval;
 
@@ -240,9 +240,9 @@ bond_port_init(struct rte_mempool *mbuf_pool)
                        "Error during getting device (port %u) info: %s\n",
                        BOND_PORT, strerror(-retval));
 
-       if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_MBUF_FAST_FREE)
+       if (dev_info.tx_offload_capa & RTE_ETH_TX_OFFLOAD_MBUF_FAST_FREE)
                local_port_conf.txmode.offloads |=
-                       DEV_TX_OFFLOAD_MBUF_FAST_FREE;
+                       RTE_ETH_TX_OFFLOAD_MBUF_FAST_FREE;
        retval = rte_eth_dev_configure(BOND_PORT, 1, 1, &local_port_conf);
        if (retval != 0)
                rte_exit(EXIT_FAILURE, "port %u: configuration failed (res=%d)\n",
@@ -405,7 +405,7 @@ static int lcore_main(__rte_unused void *arg1)
                                                struct rte_ether_hdr *);
                        ether_type = eth_hdr->ether_type;
                        if (ether_type == rte_cpu_to_be_16(RTE_ETHER_TYPE_VLAN))
-                               printf("VLAN taged frame, offset:");
+                               printf("VLAN tagged frame, offset:");
                        offset = get_vlan_offset(eth_hdr, &ether_type);
                        if (offset > 0)
                                printf("%d\n", offset);