Merge pull request #882 from Clcanny/dev

Add support for custom install prefix

Author: jfb8856606

lib/Makefile

@@ -15,10 +15,10 @@ C=${TOPDIR}/freebsd/contrib/ck/include
 MACHINE_INCLUDES_ROOT:=${CURDIR}/machine_include
 OVERRIDE_INCLUDES_ROOT:=${CURDIR}/include
 X86_INCLUDES=0
-PREFIX=/usr/local
+PREFIX?=/usr/local
 PREFIX_LIB=${PREFIX}/lib
-PREFIX_INCLUDE=/usr/local/include
-PREFIX_BIN=/usr/local/bin
+PREFIX_INCLUDE=${PREFIX}/include
+PREFIX_BIN=${PREFIX}/bin
 F-STACK_CONF=/etc/f-stack.conf
 F-STACK_VERSION=1.24
 TGT_OS=$(shell uname)

lib/ff_dpdk_if.c

@@ -656,8 +656,8 @@ init_port_start(void)
                 rte_memcpy(pconf->mac,
                     addr.addr_bytes, RTE_ETHER_ADDR_LEN);
 
-                if (dev_info.hash_key_size > 0) {
-                    /* Set RSS mode */
+                /* Set RSS mode */
+                if (dev_info.flow_type_rss_offloads) {
                     uint64_t default_rss_hf = RTE_ETH_RSS_PROTO_MASK;
                     port_conf.rxmode.mq_mode = RTE_ETH_MQ_RX_RSS;
                     port_conf.rx_adv_conf.rss_conf.rss_hf = default_rss_hf;