summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDeepak S <deepak.s@linux.intel.com>2017-07-21 09:59:39 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-07-21 09:59:39 +0000
commit75d272f80206aa886776a0a30e5547f470ce0d62 (patch)
tree4e1455ec14a72ac09f164ce8f3a535b46628cce5
parentedfede7dab90e412464cf3b0064f29f1a104acc0 (diff)
parentd88705d806228f3b5688d4d9256de6d106d206df (diff)
Merge "VNFs: Correcting the fdir mode for SWLB and HWLB"
-rw-r--r--VNFs/vACL/init.c7
-rw-r--r--VNFs/vCGNAPT/init.c11
-rw-r--r--VNFs/vFW/init.c5
3 files changed, 10 insertions, 13 deletions
diff --git a/VNFs/vACL/init.c b/VNFs/vACL/init.c
index 71dd50e4..dda6277e 100644
--- a/VNFs/vACL/init.c
+++ b/VNFs/vACL/init.c
@@ -706,11 +706,12 @@ app_init_link(struct app_params *app)
My_local_conf->rxmode.mq_mode = ETH_MQ_RX_RSS;
My_local_conf->rx_adv_conf.rss_conf.rss_key = NULL;
My_local_conf->rx_adv_conf.rss_conf.rss_hf = ETH_RSS_IP | ETH_RSS_UDP | ETH_RSS_TCP;
- } else {/* disable-rss */
- My_local_conf->rx_adv_conf.rss_conf.rss_hf = 0;
/* pkt-filter-mode is perfect */
My_local_conf->fdir_conf.mode = RTE_FDIR_MODE_PERFECT;
- }
+ } else {
+ /* disable-rss */
+ My_local_conf->rx_adv_conf.rss_conf.rss_hf = 0;
+ }
/* Set the hardware CRC stripping to avoid double stripping of FCS in VM */
p_link->conf.rxmode.hw_strip_crc = 1;
diff --git a/VNFs/vCGNAPT/init.c b/VNFs/vCGNAPT/init.c
index 3e731839..76621d51 100644
--- a/VNFs/vCGNAPT/init.c
+++ b/VNFs/vCGNAPT/init.c
@@ -993,16 +993,11 @@ app_init_link(struct app_params *app)
My_local_conf->rxmode.mq_mode = ETH_MQ_RX_RSS;
My_local_conf->rx_adv_conf.rss_conf.rss_key = NULL;
My_local_conf->rx_adv_conf.rss_conf.rss_hf = ETH_RSS_IP | ETH_RSS_UDP | ETH_RSS_TCP;
- //My_local_conf->rx_adv_conf.rss_conf.rss_hf |= ETH_RSS_UDP;
- //My_local_conf->rx_adv_conf.rss_conf.rss_hf |= ETH_RSS_IP;
- // My_local_conf->rx_adv_conf.rss_conf.rss_hf = ETH_RSS_TCP;
- }
- //#else /*for FDIR Filter*/
- else
- {/* disable-rss */
- My_local_conf->rx_adv_conf.rss_conf.rss_hf = 0;
/* pkt-filter-mode is perfect */
My_local_conf->fdir_conf.mode = RTE_FDIR_MODE_PERFECT;
+ } else {
+ /* disable-rss */
+ My_local_conf->rx_adv_conf.rss_conf.rss_hf = 0;
}
/* Set the hardware CRC stripping to avoid double stripping of FCS in VM */
diff --git a/VNFs/vFW/init.c b/VNFs/vFW/init.c
index f5d457a4..4e98b335 100644
--- a/VNFs/vFW/init.c
+++ b/VNFs/vFW/init.c
@@ -730,10 +730,11 @@ app_init_link(struct app_params *app)
My_local_conf->rx_adv_conf.rss_conf.rss_key = NULL;
My_local_conf->rx_adv_conf.rss_conf.rss_hf = ETH_RSS_IP
| ETH_RSS_UDP | ETH_RSS_TCP;
- } else {/* disable-rss */
- My_local_conf->rx_adv_conf.rss_conf.rss_hf = 0;
/* pkt-filter-mode is perfect */
My_local_conf->fdir_conf.mode = RTE_FDIR_MODE_PERFECT;
+ } else {
+ /* disable-rss */
+ My_local_conf->rx_adv_conf.rss_conf.rss_hf = 0;
}
/* Set the hardware CRC stripping to avoid double stripping