net: add rte prefix to ether functions

[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 ad0dd39..9cd4dc7 100644 (file)
--- a/examples/link_status_interrupt/main.c
+++ b/examples/link_status_interrupt/main.c
@@ -53,7 +53,7 @@ static uint16_t nb_rxd = RTE_TEST_RX_DESC_DEFAULT;
 static uint16_t nb_txd = RTE_TEST_TX_DESC_DEFAULT;
 
 /* ethernet addresses of ports */
-static struct ether_addr lsi_ports_eth_addr[RTE_MAX_ETHPORTS];
+static struct rte_ether_addr lsi_ports_eth_addr[RTE_MAX_ETHPORTS];
 
 /* mask of enabled ports */
 static uint32_t lsi_enabled_port_mask = 0;
@@ -79,8 +79,6 @@ struct rte_eth_dev_tx_buffer *tx_buffer[RTE_MAX_ETHPORTS];
 static struct rte_eth_conf port_conf = {
        .rxmode = {
                .split_hdr_size = 0,
-               .ignore_offload_bitfield = 1,
-               .offloads = DEV_RX_OFFLOAD_CRC_STRIP,
        },
        .txmode = {
                .mq_mode = ETH_MQ_TX_NONE,
@@ -165,20 +163,20 @@ print_stats(void)
 static void
 lsi_simple_forward(struct rte_mbuf *m, unsigned portid)
 {
-       struct ether_hdr *eth;
+       struct rte_ether_hdr *eth;
        void *tmp;
        unsigned dst_port = lsi_dst_ports[portid];
        int sent;
        struct rte_eth_dev_tx_buffer *buffer;
 
-       eth = rte_pktmbuf_mtod(m, struct ether_hdr *);
+       eth = rte_pktmbuf_mtod(m, struct rte_ether_hdr *);
 
        /* 02:00:00:00:00:xx */
        tmp = &eth->d_addr.addr_bytes[0];
        *((uint64_t *)tmp) = 0x000000000002 + ((uint64_t)dst_port << 40);
 
        /* src addr */
-       ether_addr_copy(&lsi_ports_eth_addr[dst_port], &eth->s_addr);
+       rte_ether_addr_copy(&lsi_ports_eth_addr[dst_port], &eth->s_addr);
 
        buffer = tx_buffer[dst_port];
        sent = rte_eth_tx_buffer(dst_port, 0, buffer, m);
@@ -542,7 +540,7 @@ main(int argc, char **argv)
        if (lsi_pktmbuf_pool == NULL)
                rte_panic("Cannot init mbuf pool\n");
 
-       nb_ports = rte_eth_dev_count();
+       nb_ports = rte_eth_dev_count_avail();
        if (nb_ports == 0)
                rte_panic("No Ethernet port - bye\n");
 
@@ -653,7 +651,6 @@ main(int argc, char **argv)
                /* init one TX queue logical core on each port */
                fflush(stdout);
                txq_conf = dev_info.default_txconf;
-               txq_conf.txq_flags = ETH_TXQ_FLAGS_IGNORE;
                txq_conf.offloads = local_port_conf.txmode.offloads;
                ret = rte_eth_tx_queue_setup(portid, 0, nb_txd,
                                rte_eth_dev_socket_id(portid),