test/crypto: add IPsec AES-CBC known vectors

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

diff --git a/examples/ipv4_multicast/main.c b/examples/ipv4_multicast/main.c
index cc527d7..bdcaa3b 100644 (file)
--- a/examples/ipv4_multicast/main.c
+++ b/examples/ipv4_multicast/main.c
@@ -20,7 +20,6 @@
 #include <rte_memcpy.h>
 #include <rte_eal.h>
 #include <rte_launch.h>
-#include <rte_atomic.h>
 #include <rte_cycles.h>
 #include <rte_prefetch.h>
 #include <rte_lcore.h>
@@ -110,13 +109,13 @@ static struct lcore_queue_conf lcore_queue_conf[RTE_MAX_LCORE];
 
 static struct rte_eth_conf port_conf = {
        .rxmode = {
-               .max_rx_pkt_len = JUMBO_FRAME_MAX_SIZE,
+               .mtu = JUMBO_FRAME_MAX_SIZE - RTE_ETHER_HDR_LEN -
+                       RTE_ETHER_CRC_LEN,
                .split_hdr_size = 0,
-               .offloads = DEV_RX_OFFLOAD_JUMBO_FRAME,
        },
        .txmode = {
-               .mq_mode = ETH_MQ_TX_NONE,
-               .offloads = DEV_TX_OFFLOAD_MULTI_SEGS,
+               .mq_mode = RTE_ETH_MQ_TX_NONE,
+               .offloads = RTE_ETH_TX_OFFLOAD_MULTI_SEGS,
        },
 };
 
@@ -283,8 +282,8 @@ mcast_send_pkt(struct rte_mbuf *pkt, struct rte_ether_addr *dest_addr,
                rte_pktmbuf_prepend(pkt, (uint16_t)sizeof(*ethdr));
        RTE_ASSERT(ethdr != NULL);
 
-       rte_ether_addr_copy(dest_addr, &ethdr->d_addr);
-       rte_ether_addr_copy(&ports_eth_addr[port], &ethdr->s_addr);
+       rte_ether_addr_copy(dest_addr, &ethdr->dst_addr);
+       rte_ether_addr_copy(&ports_eth_addr[port], &ethdr->src_addr);
        ethdr->ether_type = rte_be_to_cpu_16(RTE_ETHER_TYPE_IPV4);
 
        /* Put new packet into the output queue */
@@ -620,7 +619,7 @@ check_all_ports_link_status(uint32_t port_mask)
                                continue;
                        }
                        /* clear all_ports_up flag if any link down */
-                       if (link.link_status == ETH_LINK_DOWN) {
+                       if (link.link_status == RTE_ETH_LINK_DOWN) {
                                all_ports_up = 0;
                                break;
                        }
@@ -715,9 +714,9 @@ main(int argc, char **argv)
                                "Error during getting device (port %u) info: %s\n",
                                portid, strerror(-ret));
 
-               local_port_conf.rxmode.max_rx_pkt_len = RTE_MIN(
-                   dev_info.max_rx_pktlen,
-                   local_port_conf.rxmode.max_rx_pkt_len);
+               local_port_conf.rxmode.mtu = RTE_MIN(
+                   dev_info.max_mtu,
+                   local_port_conf.rxmode.mtu);
 
                /* get the lcore_id for this port */
                while (rte_lcore_is_enabled(rx_lcore_id) == 0 ||