cfgfile: use log for error messages

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

diff --git a/examples/ipv4_multicast/main.c b/examples/ipv4_multicast/main.c
index a84d28c..72eaadc 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 \
@@ -280,7 +280,7 @@ mcast_send_pkt(struct rte_mbuf *pkt, struct rte_ether_addr *dest_addr,
 
        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);
+       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;
@@ -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);