net: add rte prefix to ARP structures

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

diff --git a/examples/bond/main.c b/examples/bond/main.c
index ef86194..2447964 100644 (file)
--- a/examples/bond/main.c
+++ b/examples/bond/main.c
@@ -339,7 +339,7 @@ static int lcore_main(__attribute__((unused)) void *arg1)
        struct ether_addr d_addr;
 
        struct ether_hdr *eth_hdr;
-       struct arp_hdr *arp_hdr;
+       struct rte_arp_hdr *arp_hdr;
        struct ipv4_hdr *ipv4_hdr;
        uint16_t ether_type, offset;
 
@@ -382,10 +382,11 @@ static int lcore_main(__attribute__((unused)) void *arg1)
                                        global_flag_stru_p->port_packets[1]++;
                                        rte_spinlock_unlock(&global_flag_stru_p->lock);
                                }
-                               arp_hdr = (struct arp_hdr *)((char *)(eth_hdr + 1) + offset);
+                               arp_hdr = (struct rte_arp_hdr *)(
+                                       (char *)(eth_hdr + 1) + offset);
                                if (arp_hdr->arp_data.arp_tip == bond_ip) {
-                                       if (arp_hdr->arp_op == rte_cpu_to_be_16(ARP_OP_REQUEST)) {
-                                               arp_hdr->arp_op = rte_cpu_to_be_16(ARP_OP_REPLY);
+                                       if (arp_hdr->arp_opcode == rte_cpu_to_be_16(ARP_OP_REQUEST)) {
+                                               arp_hdr->arp_opcode = rte_cpu_to_be_16(ARP_OP_REPLY);
                                                /* Switch src and dst data and set bonding MAC */
                                                ether_addr_copy(&eth_hdr->s_addr, &eth_hdr->d_addr);
                                                rte_eth_macaddr_get(BOND_PORT, &eth_hdr->s_addr);
@@ -450,7 +451,7 @@ static void cmd_obj_send_parsed(void *parsed_result,
 
        struct rte_mbuf *created_pkt;
        struct ether_hdr *eth_hdr;
-       struct arp_hdr *arp_hdr;
+       struct rte_arp_hdr *arp_hdr;
 
        uint32_t bond_ip;
        size_t pkt_size;
@@ -469,7 +470,7 @@ static void cmd_obj_send_parsed(void *parsed_result,
                return;
        }
 
-       pkt_size = sizeof(struct ether_hdr) + sizeof(struct arp_hdr);
+       pkt_size = sizeof(struct ether_hdr) + sizeof(struct rte_arp_hdr);
        created_pkt->data_len = pkt_size;
        created_pkt->pkt_len = pkt_size;
 
@@ -478,12 +479,13 @@ static void cmd_obj_send_parsed(void *parsed_result,
        memset(&eth_hdr->d_addr, 0xFF, ETHER_ADDR_LEN);
        eth_hdr->ether_type = rte_cpu_to_be_16(ETHER_TYPE_ARP);
 
-       arp_hdr = (struct arp_hdr *)((char *)eth_hdr + sizeof(struct ether_hdr));
-       arp_hdr->arp_hrd = rte_cpu_to_be_16(ARP_HRD_ETHER);
-       arp_hdr->arp_pro = rte_cpu_to_be_16(ETHER_TYPE_IPv4);
-       arp_hdr->arp_hln = ETHER_ADDR_LEN;
-       arp_hdr->arp_pln = sizeof(uint32_t);
-       arp_hdr->arp_op = rte_cpu_to_be_16(ARP_OP_REQUEST);
+       arp_hdr = (struct rte_arp_hdr *)(
+               (char *)eth_hdr + sizeof(struct ether_hdr));
+       arp_hdr->arp_hardware = rte_cpu_to_be_16(ARP_HRD_ETHER);
+       arp_hdr->arp_protocol = rte_cpu_to_be_16(ETHER_TYPE_IPv4);
+       arp_hdr->arp_hlen = ETHER_ADDR_LEN;
+       arp_hdr->arp_plen = sizeof(uint32_t);
+       arp_hdr->arp_opcode = rte_cpu_to_be_16(ARP_OP_REQUEST);
 
        rte_eth_macaddr_get(BOND_PORT, &arp_hdr->arp_data.arp_sha);
        arp_hdr->arp_data.arp_sip = bond_ip;