New upstream version 16.11.4

[deb_dpdk.git] / examples / l3fwd-acl / main.c

diff --git a/examples/l3fwd-acl/main.c b/examples/l3fwd-acl/main.c
index 26d9f5e..0d0d8bf 100644 (file)
--- a/examples/l3fwd-acl/main.c
+++ b/examples/l3fwd-acl/main.c
@@ -63,7 +63,6 @@
 #include <rte_debug.h>
 #include <rte_ether.h>
 #include <rte_ethdev.h>
-#include <rte_ring.h>
 #include <rte_mempool.h>
 #include <rte_mbuf.h>
 #include <rte_ip.h>
@@ -72,6 +71,9 @@
 #include <rte_string_fns.h>
 #include <rte_acl.h>
 
+#if RTE_LOG_LEVEL >= RTE_LOG_DEBUG
+#define L3FWDACL_DEBUG
+#endif
 #define DO_RFC_1812_CHECKS
 
 #define RTE_LOGTYPE_L3FWD RTE_LOGTYPE_USER1
@@ -161,7 +163,7 @@ static struct rte_eth_conf port_conf = {
                .hw_ip_checksum = 1, /**< IP checksum offload enabled */
                .hw_vlan_filter = 0, /**< VLAN filtering disabled */
                .jumbo_frame    = 0, /**< Jumbo Frame Support disabled */
-               .hw_strip_crc   = 0, /**< CRC stripped by hardware */
+               .hw_strip_crc   = 1, /**< CRC stripped by hardware */
        },
        .rx_adv_conf = {
                .rss_conf = {
@@ -1025,6 +1027,7 @@ add_rules(const char *rule_path,
        char buff[LINE_MAX];
        FILE *fh = fopen(rule_path, "rb");
        unsigned int i = 0;
+       int val;
 
        if (fh == NULL)
                rte_exit(EXIT_FAILURE, "%s: Open %s failed\n", __func__,
@@ -1041,7 +1044,11 @@ add_rules(const char *rule_path,
                rte_exit(EXIT_FAILURE, "Not find any route entries in %s!\n",
                                rule_path);
 
-       fseek(fh, 0, SEEK_SET);
+       val = fseek(fh, 0, SEEK_SET);
+       if (val < 0) {
+               rte_exit(EXIT_FAILURE, "%s: File seek operation failed\n",
+                       __func__);
+       }
 
        acl_rules = calloc(acl_num, rule_size);
 
@@ -1914,8 +1921,6 @@ main(int argc, char **argv)
                rte_exit(EXIT_FAILURE, "init_lcore_rx_queues failed\n");
 
        nb_ports = rte_eth_dev_count();
-       if (nb_ports > RTE_MAX_ETHPORTS)
-               nb_ports = RTE_MAX_ETHPORTS;
 
        if (check_port_config(nb_ports) < 0)
                rte_exit(EXIT_FAILURE, "check_port_config failed\n");