examples/ip_frag: fix use of ethdev internal device array

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

diff --git a/examples/bond/main.c b/examples/bond/main.c
index 2e81a9e..1c0df9d 100644 (file)
--- a/examples/bond/main.c
+++ b/examples/bond/main.c
@@ -341,7 +341,7 @@ static int lcore_main(__attribute__((unused)) void *arg1)
 
        struct rte_ether_hdr *eth_hdr;
        struct rte_arp_hdr *arp_hdr;
-       struct ipv4_hdr *ipv4_hdr;
+       struct rte_ipv4_hdr *ipv4_hdr;
        uint16_t ether_type, offset;
 
        uint16_t rx_cnt;
@@ -404,12 +404,12 @@ static int lcore_main(__attribute__((unused)) void *arg1)
                                                rte_eth_tx_burst(BOND_PORT, 0, NULL, 0);
                                        }
                                }
-                       } else if (ether_type == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv4)) {
+                       } else if (ether_type == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4)) {
                                if (rte_spinlock_trylock(&global_flag_stru_p->lock) == 1)     {
                                        global_flag_stru_p->port_packets[2]++;
                                        rte_spinlock_unlock(&global_flag_stru_p->lock);
                                 }
-                               ipv4_hdr = (struct ipv4_hdr *)((char *)(eth_hdr + 1) + offset);
+                               ipv4_hdr = (struct rte_ipv4_hdr *)((char *)(eth_hdr + 1) + offset);
                                if (ipv4_hdr->dst_addr == bond_ip) {
                                        rte_ether_addr_copy(&eth_hdr->s_addr, &eth_hdr->d_addr);
                                        rte_eth_macaddr_get(BOND_PORT, &eth_hdr->s_addr);
@@ -485,7 +485,7 @@ static void cmd_obj_send_parsed(void *parsed_result,
        arp_hdr = (struct rte_arp_hdr *)(
                (char *)eth_hdr + sizeof(struct rte_ether_hdr));
        arp_hdr->arp_hardware = rte_cpu_to_be_16(RTE_ARP_HRD_ETHER);
-       arp_hdr->arp_protocol = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv4);
+       arp_hdr->arp_protocol = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4);
        arp_hdr->arp_hlen = RTE_ETHER_ADDR_LEN;
        arp_hdr->arp_plen = sizeof(uint32_t);
        arp_hdr->arp_opcode = rte_cpu_to_be_16(RTE_ARP_OP_REQUEST);
@@ -531,8 +531,9 @@ static void cmd_start_parsed(__attribute__((unused)) void *parsed_result,
        int slave_core_id = rte_lcore_id();
 
        rte_spinlock_trylock(&global_flag_stru_p->lock);
-       if (global_flag_stru_p->LcoreMainIsRunning == 0)        {
-               if (lcore_config[global_flag_stru_p->LcoreMainCore].state != WAIT)      {
+       if (global_flag_stru_p->LcoreMainIsRunning == 0) {
+               if (rte_eal_get_lcore_state(global_flag_stru_p->LcoreMainCore)
+                   != WAIT) {
                        rte_spinlock_unlock(&global_flag_stru_p->lock);
                        return;
                }
@@ -765,7 +766,7 @@ static void prompt(__attribute__((unused)) void *arg1)
 int
 main(int argc, char *argv[])
 {
-       int ret;
+       int ret, slave_core_id;
        uint16_t nb_ports, i;
 
        /* init EAL */
@@ -797,13 +798,13 @@ main(int argc, char *argv[])
        bond_port_init(mbuf_pool);
 
        rte_spinlock_init(&global_flag_stru_p->lock);
-       int slave_core_id = rte_lcore_id();
 
        /* check state of lcores */
        RTE_LCORE_FOREACH_SLAVE(slave_core_id) {
-       if (lcore_config[slave_core_id].state != WAIT)
-               return -EBUSY;
+               if (rte_eal_get_lcore_state(slave_core_id) != WAIT)
+                       return -EBUSY;
        }
+
        /* start lcore main on core != master_core - ARP response thread */
        slave_core_id = rte_get_next_lcore(rte_lcore_id(), 1, 0);
        if ((slave_core_id >= RTE_MAX_LCORE) || (slave_core_id == 0))