summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPablo de Lara <pablo.de.lara.guarch@intel.com>2015-08-09 11:28:45 +0100
committerThomas Monjalon <thomas.monjalon@6wind.com>2015-08-10 22:35:24 +0200
commit6f1c1e28d98e11c679538ea5eebd0401adba8f55 (patch)
tree0709b211ff246e7bc4bb55af4f3545db0f281409
parent10cbac6ae95e27f99d81d4d6a4e00bf73de3ef13 (diff)
downloaddpdk-6f1c1e28d98e11c679538ea5eebd0401adba8f55.zip
dpdk-6f1c1e28d98e11c679538ea5eebd0401adba8f55.tar.gz
dpdk-6f1c1e28d98e11c679538ea5eebd0401adba8f55.tar.xz
examples/l3fwd: fix build with exact-match enabled
L3fwd was trying to use an inexistent function "simple_ipv6_fwd_4pkts", instead it should be "simple_ipv6_fwd_8pkts", and "simple_ipv8_fwd_4pkts" instead of "simple_ipv4_fwd_8pkts". clang reports some unused functions, used only for LPM lookup: examples/l3fwd/main.c:545:1: error: unused function 'send_packetsx4' examples/l3fwd/main.c:1165:1: error: unused function 'rfc1812_process' Fixes: 80fcb4d4 ("examples/l3fwd: increase lookup burst size to 8") Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com> Acked-by: Sergio Gonzalez Monroy <sergio.gonzalez.monroy@intel.com> [Thomas: more #if to fix clang warnings] Signed-off-by: Thomas Monjalon <thomas.monjalon@6wind.com>
-rw-r--r--examples/l3fwd/main.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/examples/l3fwd/main.c b/examples/l3fwd/main.c
index 9351322..fe5a257 100644
--- a/examples/l3fwd/main.c
+++ b/examples/l3fwd/main.c
@@ -541,6 +541,7 @@ send_single_packet(struct rte_mbuf *m, uint8_t port)
return 0;
}
+#if (APP_LOOKUP_METHOD == APP_LOOKUP_LPM)
static inline __attribute__((always_inline)) void
send_packetsx4(struct lcore_conf *qconf, uint8_t port,
struct rte_mbuf *m[], uint32_t num)
@@ -618,6 +619,7 @@ send_packetsx4(struct lcore_conf *qconf, uint8_t port,
qconf->tx_mbufs[port].len = len;
}
+#endif /* APP_LOOKUP_LPM */
#ifdef DO_RFC_1812_CHECKS
static inline int
@@ -1138,6 +1140,8 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint8_t portid, struct lcore_conf *qcon
#endif
}
+#if ((APP_LOOKUP_METHOD == APP_LOOKUP_LPM) && \
+ (ENABLE_MULTI_BUFFER_OPTIMIZE == 1))
#ifdef DO_RFC_1812_CHECKS
#define IPV4_MIN_VER_IHL 0x45
@@ -1188,6 +1192,7 @@ rfc1812_process(struct ipv4_hdr *ipv4_hdr, uint16_t *dp, uint32_t flags)
#else
#define rfc1812_process(mb, dp) do { } while (0)
#endif /* DO_RFC_1812_CHECKS */
+#endif /* APP_LOOKUP_LPM && ENABLE_MULTI_BUFFER_OPTIMIZE */
#if ((APP_LOOKUP_METHOD == APP_LOOKUP_LPM) && \
@@ -1710,11 +1715,11 @@ main_loop(__attribute__((unused)) void *dummy)
& pkts_burst[j+6]->ol_flags
& pkts_burst[j+7]->ol_flags;
if (ol_flag & PKT_RX_IPV4_HDR ) {
- simple_ipv8_fwd_4pkts(&pkts_burst[j],
+ simple_ipv4_fwd_8pkts(&pkts_burst[j],
portid, qconf);
} else if (ol_flag & PKT_RX_IPV6_HDR) {
#endif /* RTE_NEXT_ABI */
- simple_ipv6_fwd_4pkts(&pkts_burst[j],
+ simple_ipv6_fwd_8pkts(&pkts_burst[j],
portid, qconf);
} else {
l3fwd_simple_forward(pkts_burst[j],