X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=examples%2Fl3fwd-vf%2Fmain.c;h=1432f89694a611eb88d1f4bc553fa158bc27b7b1;hb=f67c9e8df9c6a897c1990559e925a233c44ed0e6;hp=d57ac262b6ec529f2d275c5806e0ddb9066a072e;hpb=f41b5156feb575b9cfeb177974c8e625e09b480f;p=dpdk.git

diff --git a/examples/l3fwd-vf/main.c b/examples/l3fwd-vf/main.c
index d57ac262b6..1432f89694 100644
--- a/examples/l3fwd-vf/main.c
+++ b/examples/l3fwd-vf/main.c
@@ -74,25 +74,6 @@
 				nb_lcores*MEMPOOL_CACHE_SIZE),		\
 				(unsigned)8192)
 
-/*
- * RX and TX Prefetch, Host, and Write-back threshold values should be
- * carefully set for optimal performance. Consult the network
- * controller's datasheet and supporting DPDK documentation for guidance
- * on how these parameters should be set.
- */
-#define RX_PTHRESH 8 /**< Default values of RX prefetch threshold reg. */
-#define RX_HTHRESH 8 /**< Default values of RX host threshold reg. */
-#define RX_WTHRESH 4 /**< Default values of RX write-back threshold reg. */
-
-/*
- * These default values are optimized for use with the Intel(R) 82599 10 GbE
- * Controller and the DPDK ixgbe PMD. Consider using other values for other
- * network controllers and/or network drivers.
- */
-#define TX_PTHRESH 36 /**< Default values of TX prefetch threshold reg. */
-#define TX_HTHRESH 0  /**< Default values of TX host threshold reg. */
-#define TX_WTHRESH 0  /**< Default values of TX write-back threshold reg. */
-
 #define MAX_PKT_BURST 32
 #define BURST_TX_DRAIN_US 100 /* TX drain every ~100us */
 
@@ -201,10 +182,10 @@ struct l3fwd_route {
 };
 
 static struct l3fwd_route l3fwd_route_array[] = {
-	{{RTE_IPv4(100,10,0,1), RTE_IPv4(200,10,0,1), 101, 11, IPPROTO_TCP}, 0},
-	{{RTE_IPv4(100,20,0,2), RTE_IPv4(200,20,0,2), 102, 12, IPPROTO_TCP}, 1},
-	{{RTE_IPv4(100,30,0,3), RTE_IPv4(200,30,0,3), 103, 13, IPPROTO_TCP}, 2},
-	{{RTE_IPv4(100,40,0,4), RTE_IPv4(200,40,0,4), 104, 14, IPPROTO_TCP}, 3},
+	{{RTE_IPV4(100,10,0,1), RTE_IPV4(200,10,0,1), 101, 11, IPPROTO_TCP}, 0},
+	{{RTE_IPV4(100,20,0,2), RTE_IPV4(200,20,0,2), 102, 12, IPPROTO_TCP}, 1},
+	{{RTE_IPV4(100,30,0,3), RTE_IPV4(200,30,0,3), 103, 13, IPPROTO_TCP}, 2},
+	{{RTE_IPV4(100,40,0,4), RTE_IPV4(200,40,0,4), 104, 14, IPPROTO_TCP}, 3},
 };
 
 typedef struct rte_hash lookup_struct_t;
@@ -234,14 +215,14 @@ struct l3fwd_route {
 };
 
 static struct l3fwd_route l3fwd_route_array[] = {
-	{RTE_IPv4(1,1,1,0), 24, 0},
-	{RTE_IPv4(2,1,1,0), 24, 1},
-	{RTE_IPv4(3,1,1,0), 24, 2},
-	{RTE_IPv4(4,1,1,0), 24, 3},
-	{RTE_IPv4(5,1,1,0), 24, 4},
-	{RTE_IPv4(6,1,1,0), 24, 5},
-	{RTE_IPv4(7,1,1,0), 24, 6},
-	{RTE_IPv4(8,1,1,0), 24, 7},
+	{RTE_IPV4(1,1,1,0), 24, 0},
+	{RTE_IPV4(2,1,1,0), 24, 1},
+	{RTE_IPV4(3,1,1,0), 24, 2},
+	{RTE_IPV4(4,1,1,0), 24, 3},
+	{RTE_IPV4(5,1,1,0), 24, 4},
+	{RTE_IPV4(6,1,1,0), 24, 5},
+	{RTE_IPV4(7,1,1,0), 24, 6},
+	{RTE_IPV4(8,1,1,0), 24, 7},
 };
 
 #define L3FWD_NUM_ROUTES \
@@ -367,7 +348,7 @@ get_dst_port(struct rte_ipv4_hdr *ipv4_hdr, uint16_t portid,
 {
 	struct ipv4_5tuple key;
 	struct rte_tcp_hdr *tcp;
-	struct udp_hdr *udp;
+	struct rte_udp_hdr *udp;
 	int ret = 0;
 
 	key.ip_dst = rte_be_to_cpu_32(ipv4_hdr->dst_addr);
@@ -383,7 +364,7 @@ get_dst_port(struct rte_ipv4_hdr *ipv4_hdr, uint16_t portid,
 		break;
 
 	case IPPROTO_UDP:
-		udp = (struct udp_hdr *)((unsigned char *) ipv4_hdr +
+		udp = (struct rte_udp_hdr *)((unsigned char *) ipv4_hdr +
 					sizeof(struct rte_ipv4_hdr));
 		key.port_dst = rte_be_to_cpu_16(udp->dst_port);
 		key.port_src = rte_be_to_cpu_16(udp->src_port);