git.droids-corp.org / dpdk.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
net: add rte prefix to ether defines
[dpdk.git] / examples / bond / main.c
diff --git a/examples/bond/main.c b/examples/bond/main.c
index 2447964..2e81a9e 100644 (file)
--- a/examples/bond/main.c
+++ b/examples/bond/main.c
@@ -120,7 +120,7 @@ static struct rte_mempool *mbuf_pool;
 static struct rte_eth_conf port_conf = {
        .rxmode = {
                .mq_mode = ETH_MQ_RX_NONE,
-               .max_rx_pkt_len = ETHER_MAX_LEN,
+               .max_rx_pkt_len = RTE_ETHER_MAX_LEN,
                .split_hdr_size = 0,
        },
        .rx_adv_conf = {
@@ -201,7 +201,7 @@ slave_port_init(uint16_t portid, struct rte_mempool *mbuf_pool)
                                "Start port %d failed (res=%d)",
                                portid, retval);
 
-       struct ether_addr addr;
+       struct rte_ether_addr addr;
 
        rte_eth_macaddr_get(portid, &addr);
        printf("Port %u MAC: ", portid);
@@ -291,7 +291,7 @@ bond_port_init(struct rte_mempool *mbuf_pool)
 
        rte_eth_promiscuous_enable(BOND_PORT);
 
-       struct ether_addr addr;
+       struct rte_ether_addr addr;
 
        rte_eth_macaddr_get(BOND_PORT, &addr);
        printf("Port %u MAC: ", (unsigned)BOND_PORT);
@@ -300,21 +300,22 @@ bond_port_init(struct rte_mempool *mbuf_pool)
 }
 
 static inline size_t
-get_vlan_offset(struct ether_hdr *eth_hdr, uint16_t *proto)
+get_vlan_offset(struct rte_ether_hdr *eth_hdr, uint16_t *proto)
 {
        size_t vlan_offset = 0;
 
-       if (rte_cpu_to_be_16(ETHER_TYPE_VLAN) == *proto) {
-               struct vlan_hdr *vlan_hdr = (struct vlan_hdr *)(eth_hdr + 1);
+       if (rte_cpu_to_be_16(RTE_ETHER_TYPE_VLAN) == *proto) {
+               struct rte_vlan_hdr *vlan_hdr =
+                       (struct rte_vlan_hdr *)(eth_hdr + 1);
 
-               vlan_offset = sizeof(struct vlan_hdr);
+               vlan_offset = sizeof(struct rte_vlan_hdr);
                *proto = vlan_hdr->eth_proto;
 
-               if (rte_cpu_to_be_16(ETHER_TYPE_VLAN) == *proto) {
+               if (rte_cpu_to_be_16(RTE_ETHER_TYPE_VLAN) == *proto) {
                        vlan_hdr = vlan_hdr + 1;
 
                        *proto = vlan_hdr->eth_proto;
-                       vlan_offset += sizeof(struct vlan_hdr);
+                       vlan_offset += sizeof(struct rte_vlan_hdr);
                }
        }
        return vlan_offset;
@@ -336,9 +337,9 @@ struct global_flag_stru_t *global_flag_stru_p = &global_flag_stru;
 static int lcore_main(__attribute__((unused)) void *arg1)
 {
        struct rte_mbuf *pkts[MAX_PKT_BURST] __rte_cache_aligned;
-       struct ether_addr d_addr;
+       struct rte_ether_addr d_addr;
 
-       struct ether_hdr *eth_hdr;
+       struct rte_ether_hdr *eth_hdr;
        struct rte_arp_hdr *arp_hdr;
        struct ipv4_hdr *ipv4_hdr;
        uint16_t ether_type, offset;
@@ -370,14 +371,15 @@ static int lcore_main(__attribute__((unused)) void *arg1)
                                global_flag_stru_p->port_packets[0]++;
                                rte_spinlock_unlock(&global_flag_stru_p->lock);
                        }
-                       eth_hdr = rte_pktmbuf_mtod(pkts[i], struct ether_hdr *);
+                       eth_hdr = rte_pktmbuf_mtod(pkts[i],
+                                               struct rte_ether_hdr *);
                        ether_type = eth_hdr->ether_type;
-                       if (ether_type == rte_cpu_to_be_16(ETHER_TYPE_VLAN))
+                       if (ether_type == rte_cpu_to_be_16(RTE_ETHER_TYPE_VLAN))
                                printf("VLAN taged frame, offset:");
                        offset = get_vlan_offset(eth_hdr, &ether_type);
                        if (offset > 0)
                                printf("%d\n", offset);
-                       if (ether_type == rte_cpu_to_be_16(ETHER_TYPE_ARP)) {
+                       if (ether_type == rte_cpu_to_be_16(RTE_ETHER_TYPE_ARP)) {
                                if (rte_spinlock_trylock(&global_flag_stru_p->lock) == 1)     {
                                        global_flag_stru_p->port_packets[1]++;
                                        rte_spinlock_unlock(&global_flag_stru_p->lock);
@@ -385,15 +387,16 @@ static int lcore_main(__attribute__((unused)) void *arg1)
                                arp_hdr = (struct rte_arp_hdr *)(
                                        (char *)(eth_hdr + 1) + offset);
                                if (arp_hdr->arp_data.arp_tip == bond_ip) {
-                                       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);
+                                       if (arp_hdr->arp_opcode == rte_cpu_to_be_16(RTE_ARP_OP_REQUEST)) {
+                                               arp_hdr->arp_opcode = rte_cpu_to_be_16(RTE_ARP_OP_REPLY);
                                                /* Switch src and dst data and set bonding MAC */
-                                               ether_addr_copy(&eth_hdr->s_addr, &eth_hdr->d_addr);
+                                               rte_ether_addr_copy(&eth_hdr->s_addr, &eth_hdr->d_addr);
                                                rte_eth_macaddr_get(BOND_PORT, &eth_hdr->s_addr);
-                                               ether_addr_copy(&arp_hdr->arp_data.arp_sha, &arp_hdr->arp_data.arp_tha);
+                                               rte_ether_addr_copy(&arp_hdr->arp_data.arp_sha,
+                                                               &arp_hdr->arp_data.arp_tha);
                                                arp_hdr->arp_data.arp_tip = arp_hdr->arp_data.arp_sip;
                                                rte_eth_macaddr_get(BOND_PORT, &d_addr);
-                                               ether_addr_copy(&d_addr, &arp_hdr->arp_data.arp_sha);
+                                               rte_ether_addr_copy(&d_addr, &arp_hdr->arp_data.arp_sha);
                                                arp_hdr->arp_data.arp_sip = bond_ip;
                                                rte_eth_tx_burst(BOND_PORT, 0, &pkts[i], 1);
                                                is_free = 1;
@@ -401,14 +404,14 @@ 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(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);
                                if (ipv4_hdr->dst_addr == bond_ip) {
-                                       ether_addr_copy(&eth_hdr->s_addr, &eth_hdr->d_addr);
+                                       rte_ether_addr_copy(&eth_hdr->s_addr, &eth_hdr->d_addr);
                                        rte_eth_macaddr_get(BOND_PORT, &eth_hdr->s_addr);
                                        ipv4_hdr->dst_addr = ipv4_hdr->src_addr;
                                        ipv4_hdr->src_addr = bond_ip;
@@ -450,7 +453,7 @@ static void cmd_obj_send_parsed(void *parsed_result,
        char ip_str[INET6_ADDRSTRLEN];
 
        struct rte_mbuf *created_pkt;
-       struct ether_hdr *eth_hdr;
+       struct rte_ether_hdr *eth_hdr;
        struct rte_arp_hdr *arp_hdr;
 
        uint32_t bond_ip;
@@ -470,26 +473,26 @@ static void cmd_obj_send_parsed(void *parsed_result,
                return;
        }
 
-       pkt_size = sizeof(struct ether_hdr) + sizeof(struct rte_arp_hdr);
+       pkt_size = sizeof(struct rte_ether_hdr) + sizeof(struct rte_arp_hdr);
        created_pkt->data_len = pkt_size;
        created_pkt->pkt_len = pkt_size;
 
-       eth_hdr = rte_pktmbuf_mtod(created_pkt, struct ether_hdr *);
+       eth_hdr = rte_pktmbuf_mtod(created_pkt, struct rte_ether_hdr *);
        rte_eth_macaddr_get(BOND_PORT, &eth_hdr->s_addr);
-       memset(&eth_hdr->d_addr, 0xFF, ETHER_ADDR_LEN);
-       eth_hdr->ether_type = rte_cpu_to_be_16(ETHER_TYPE_ARP);
+       memset(&eth_hdr->d_addr, 0xFF, RTE_ETHER_ADDR_LEN);
+       eth_hdr->ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_ARP);
 
        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;
+               (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_hlen = RTE_ETHER_ADDR_LEN;
        arp_hdr->arp_plen = sizeof(uint32_t);
-       arp_hdr->arp_opcode = rte_cpu_to_be_16(ARP_OP_REQUEST);
+       arp_hdr->arp_opcode = rte_cpu_to_be_16(RTE_ARP_OP_REQUEST);
 
        rte_eth_macaddr_get(BOND_PORT, &arp_hdr->arp_data.arp_sha);
        arp_hdr->arp_data.arp_sip = bond_ip;
-       memset(&arp_hdr->arp_data.arp_tha, 0, ETHER_ADDR_LEN);
+       memset(&arp_hdr->arp_data.arp_tha, 0, RTE_ETHER_ADDR_LEN);
        arp_hdr->arp_data.arp_tip =
                          ((unsigned char *)&res->ip.addr.ipv4)[0]        |
                         (((unsigned char *)&res->ip.addr.ipv4)[1] << 8)  |
@@ -700,7 +703,7 @@ static void cmd_show_parsed(__attribute__((unused)) void *parsed_result,
 {
        uint16_t slaves[16] = {0};
        uint8_t len = 16;
-       struct ether_addr addr;
+       struct rte_ether_addr addr;
        uint16_t i = 0;
 
        while (i < slaves_count)        {
DPDK repo used for reviews