kni: rename variable with namespace prefix

[dpdk.git] / app / test-pmd / flowgen.c

diff --git a/app/test-pmd/flowgen.c b/app/test-pmd/flowgen.c
index a970a27..03b72aa 100644 (file)
--- a/app/test-pmd/flowgen.c
+++ b/app/test-pmd/flowgen.c
@@ -72,8 +72,8 @@
 
 /* hardcoded configuration (for now) */
 static unsigned cfg_n_flows    = 1024;
-static uint32_t cfg_ip_src     = RTE_IPv4(10, 254, 0, 0);
-static uint32_t cfg_ip_dst     = RTE_IPv4(10, 253, 0, 0);
+static uint32_t cfg_ip_src     = RTE_IPV4(10, 254, 0, 0);
+static uint32_t cfg_ip_dst     = RTE_IPV4(10, 253, 0, 0);
 static uint16_t cfg_udp_src    = 1000;
 static uint16_t cfg_udp_dst    = 1001;
 static struct rte_ether_addr cfg_ether_src =
@@ -82,9 +82,6 @@ static struct rte_ether_addr cfg_ether_dst =
        {{ 0x00, 0x01, 0x02, 0x03, 0x04, 0x01 }};
 
 #define IP_DEFTTL  64   /* from RFC 1340. */
-#define IP_VERSION 0x40
-#define IP_HDRLEN  0x05 /* default IP header length == five 32-bits words. */
-#define IP_VHL_DEF (IP_VERSION | IP_HDRLEN)
 
 static inline uint16_t
 ip_sum(const unaligned_uint16_t *hdr, int hdr_len)
@@ -173,12 +170,12 @@ pkt_burst_flow_gen(struct fwd_stream *fs)
                eth_hdr = rte_pktmbuf_mtod(pkt, struct rte_ether_hdr *);
                rte_ether_addr_copy(&cfg_ether_dst, &eth_hdr->d_addr);
                rte_ether_addr_copy(&cfg_ether_src, &eth_hdr->s_addr);
-               eth_hdr->ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv4);
+               eth_hdr->ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4);
 
                /* Initialize IP header. */
                ip_hdr = (struct rte_ipv4_hdr *)(eth_hdr + 1);
                memset(ip_hdr, 0, sizeof(*ip_hdr));
-               ip_hdr->version_ihl     = IP_VHL_DEF;
+               ip_hdr->version_ihl     = RTE_IPV4_VHL_DEF;
                ip_hdr->type_of_service = 0;
                ip_hdr->fragment_offset = 0;
                ip_hdr->time_to_live    = IP_DEFTTL;