examples/vhost_crypto: support build with pkg-config

[dpdk.git] / examples / l3fwd-vf / main.c

diff --git a/examples/l3fwd-vf/main.c b/examples/l3fwd-vf/main.c
index ebb2378..1432f89 100644 (file)
--- 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[] = {
-       {{IPv4(100,10,0,1), IPv4(200,10,0,1), 101, 11, IPPROTO_TCP}, 0},
-       {{IPv4(100,20,0,2), IPv4(200,20,0,2), 102, 12, IPPROTO_TCP}, 1},
-       {{IPv4(100,30,0,3), IPv4(200,30,0,3), 103, 13, IPPROTO_TCP}, 2},
-       {{IPv4(100,40,0,4), 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[] = {
-       {IPv4(1,1,1,0), 24, 0},
-       {IPv4(2,1,1,0), 24, 1},
-       {IPv4(3,1,1,0), 24, 2},
-       {IPv4(4,1,1,0), 24, 3},
-       {IPv4(5,1,1,0), 24, 4},
-       {IPv4(6,1,1,0), 24, 5},
-       {IPv4(7,1,1,0), 24, 6},
-       {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 \
@@ -366,8 +347,8 @@ get_dst_port(struct rte_ipv4_hdr *ipv4_hdr, uint16_t portid,
              lookup_struct_t *l3fwd_lookup_struct)
 {
        struct ipv4_5tuple key;
-       struct tcp_hdr *tcp;
-       struct udp_hdr *udp;
+       struct rte_tcp_hdr *tcp;
+       struct rte_udp_hdr *udp;
        int ret = 0;
 
        key.ip_dst = rte_be_to_cpu_32(ipv4_hdr->dst_addr);
@@ -376,14 +357,14 @@ get_dst_port(struct rte_ipv4_hdr *ipv4_hdr, uint16_t portid,
 
        switch (ipv4_hdr->next_proto_id) {
        case IPPROTO_TCP:
-               tcp = (struct tcp_hdr *)((unsigned char *) ipv4_hdr +
+               tcp = (struct rte_tcp_hdr *)((unsigned char *) ipv4_hdr +
                                        sizeof(struct rte_ipv4_hdr));
                key.port_dst = rte_be_to_cpu_16(tcp->dst_port);
                key.port_src = rte_be_to_cpu_16(tcp->src_port);
                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);