net: add rte prefix to IP defines

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

diff --git a/examples/ipv4_multicast/main.c b/examples/ipv4_multicast/main.c
index a047197..15f2b4b 100644 (file)
--- a/examples/ipv4_multicast/main.c
+++ b/examples/ipv4_multicast/main.c
@@ -138,21 +138,21 @@ struct mcast_group_params {
 };
 
 static struct mcast_group_params mcast_group_table[] = {
-               {IPv4(224,0,0,101), 0x1},
-               {IPv4(224,0,0,102), 0x2},
-               {IPv4(224,0,0,103), 0x3},
-               {IPv4(224,0,0,104), 0x4},
-               {IPv4(224,0,0,105), 0x5},
-               {IPv4(224,0,0,106), 0x6},
-               {IPv4(224,0,0,107), 0x7},
-               {IPv4(224,0,0,108), 0x8},
-               {IPv4(224,0,0,109), 0x9},
-               {IPv4(224,0,0,110), 0xA},
-               {IPv4(224,0,0,111), 0xB},
-               {IPv4(224,0,0,112), 0xC},
-               {IPv4(224,0,0,113), 0xD},
-               {IPv4(224,0,0,114), 0xE},
-               {IPv4(224,0,0,115), 0xF},
+               {RTE_IPv4(224,0,0,101), 0x1},
+               {RTE_IPv4(224,0,0,102), 0x2},
+               {RTE_IPv4(224,0,0,103), 0x3},
+               {RTE_IPv4(224,0,0,104), 0x4},
+               {RTE_IPv4(224,0,0,105), 0x5},
+               {RTE_IPv4(224,0,0,106), 0x6},
+               {RTE_IPv4(224,0,0,107), 0x7},
+               {RTE_IPv4(224,0,0,108), 0x8},
+               {RTE_IPv4(224,0,0,109), 0x9},
+               {RTE_IPv4(224,0,0,110), 0xA},
+               {RTE_IPv4(224,0,0,111), 0xB},
+               {RTE_IPv4(224,0,0,112), 0xC},
+               {RTE_IPv4(224,0,0,113), 0xD},
+               {RTE_IPv4(224,0,0,114), 0xE},
+               {RTE_IPv4(224,0,0,115), 0xF},
 };
 
 #define N_MCAST_GROUPS \
@@ -278,9 +278,9 @@ mcast_send_pkt(struct rte_mbuf *pkt, struct rte_ether_addr *dest_addr,
                rte_pktmbuf_prepend(pkt, (uint16_t)sizeof(*ethdr));
        RTE_ASSERT(ethdr != NULL);
 
-       ether_addr_copy(dest_addr, &ethdr->d_addr);
-       ether_addr_copy(&ports_eth_addr[port], &ethdr->s_addr);
-       ethdr->ether_type = rte_be_to_cpu_16(ETHER_TYPE_IPv4);
+       rte_ether_addr_copy(dest_addr, &ethdr->d_addr);
+       rte_ether_addr_copy(&ports_eth_addr[port], &ethdr->s_addr);
+       ethdr->ether_type = rte_be_to_cpu_16(RTE_ETHER_TYPE_IPv4);
 
        /* Put new packet into the output queue */
        len = qconf->tx_mbufs[port].len;
@@ -297,7 +297,7 @@ static inline void
 mcast_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf)
 {
        struct rte_mbuf *mc;
-       struct ipv4_hdr *iphdr;
+       struct rte_ipv4_hdr *iphdr;
        uint32_t dest_addr, port_mask, port_num, use_clone;
        int32_t hash;
        uint16_t port;
@@ -307,7 +307,7 @@ mcast_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf)
        } dst_eth_addr;
 
        /* Remove the Ethernet header from the input packet */
-       iphdr = (struct ipv4_hdr *)
+       iphdr = (struct rte_ipv4_hdr *)
                rte_pktmbuf_adj(m, (uint16_t)sizeof(struct rte_ether_hdr));
        RTE_ASSERT(iphdr != NULL);
 
@@ -317,7 +317,7 @@ mcast_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf)
         * Check that it is a valid multicast address and
         * we have some active ports assigned to it.
         */
-       if(!IS_IPV4_MCAST(dest_addr) ||
+       if (!RTE_IS_IPV4_MCAST(dest_addr) ||
            (hash = rte_fbk_hash_lookup(mcast_hash, dest_addr)) <= 0 ||
            (port_mask = hash & enabled_port_mask) == 0) {
                rte_pktmbuf_free(m);
@@ -539,8 +539,8 @@ parse_args(int argc, char **argv)
 static void
 print_ethaddr(const char *name, struct rte_ether_addr *eth_addr)
 {
-       char buf[ETHER_ADDR_FMT_SIZE];
-       ether_format_addr(buf, ETHER_ADDR_FMT_SIZE, eth_addr);
+       char buf[RTE_ETHER_ADDR_FMT_SIZE];
+       rte_ether_format_addr(buf, RTE_ETHER_ADDR_FMT_SIZE, eth_addr);
        printf("%s%s", name, buf);
 }