app/testpmd: fix multicast address pool leak

[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 7470aa5..551f052 100644 (file)
--- a/examples/link_status_interrupt/main.c
+++ b/examples/link_status_interrupt/main.c
@@ -22,7 +22,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>
@@ -83,7 +82,7 @@ static struct rte_eth_conf port_conf = {
                .split_hdr_size = 0,
        },
        .txmode = {
-               .mq_mode = ETH_MQ_TX_NONE,
+               .mq_mode = RTE_ETH_MQ_TX_NONE,
        },
        .intr_conf = {
                .lsc = 1, /**< lsc interrupt feature enabled */
@@ -147,7 +146,7 @@ print_stats(void)
                           link_get_err < 0 ? "0" :
                           rte_eth_link_speed_to_str(link.link_speed),
                           link_get_err < 0 ? "Link get failed" :
-                          (link.link_duplex == ETH_LINK_FULL_DUPLEX ? \
+                          (link.link_duplex == RTE_ETH_LINK_FULL_DUPLEX ?
                                        "full-duplex" : "half-duplex"),
                           port_statistics[portid].tx,
                           port_statistics[portid].rx,
@@ -182,11 +181,11 @@ lsi_simple_forward(struct rte_mbuf *m, unsigned portid)
        eth = rte_pktmbuf_mtod(m, struct rte_ether_hdr *);
 
        /* 02:00:00:00:00:xx */
-       tmp = &eth->d_addr.addr_bytes[0];
+       tmp = &eth->dst_addr.addr_bytes[0];
        *((uint64_t *)tmp) = 0x000000000002 + ((uint64_t)dst_port << 40);
 
        /* src addr */
-       rte_ether_addr_copy(&lsi_ports_eth_addr[dst_port], &eth->s_addr);
+       rte_ether_addr_copy(&lsi_ports_eth_addr[dst_port], &eth->src_addr);
 
        buffer = tx_buffer[dst_port];
        sent = rte_eth_tx_buffer(dst_port, 0, buffer, m);
@@ -507,7 +506,7 @@ check_all_ports_link_status(uint16_t port_num, 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;
                        }
@@ -634,9 +633,9 @@ main(int argc, char **argv)
                                "Error during getting device (port %u) info: %s\n",
                                portid, strerror(-ret));
 
-               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;
                /* Configure RX and TX queues. 8< */
                ret = rte_eth_dev_configure(portid, 1, 1, &local_port_conf);
                if (ret < 0)
@@ -725,14 +724,9 @@ main(int argc, char **argv)
                                "rte_eth_promiscuous_enable: err=%s, port=%u\n",
                                rte_strerror(-ret), portid);
 
-               printf("Port %u, MAC address: %02X:%02X:%02X:%02X:%02X:%02X\n\n",
+               printf("Port %u, MAC address: " RTE_ETHER_ADDR_PRT_FMT "\n\n",
                                (unsigned) portid,
-                               lsi_ports_eth_addr[portid].addr_bytes[0],
-                               lsi_ports_eth_addr[portid].addr_bytes[1],
-                               lsi_ports_eth_addr[portid].addr_bytes[2],
-                               lsi_ports_eth_addr[portid].addr_bytes[3],
-                               lsi_ports_eth_addr[portid].addr_bytes[4],
-                               lsi_ports_eth_addr[portid].addr_bytes[5]);
+                       RTE_ETHER_ADDR_BYTES(&lsi_ports_eth_addr[portid]));
 
                /* initialize port stats */
                memset(&port_statistics, 0, sizeof(port_statistics));