From d88705d806228f3b5688d4d9256de6d106d206df Mon Sep 17 00:00:00 2001 From: Anand B Jyoti Date: Thu, 20 Jul 2017 11:49:26 +0530 Subject: VNFs: Correcting the fdir mode for SWLB and HWLB JIRA: SAMPLEVNF-64 fdir conf mode was incorrectly set to RTE_FDIR_MODE_PERFECT in SWLB and also RTE_FDIR_MODE_NONE in HWLB. This patches corrects them to enable the Vector PMD. Change-Id: I2097479c948ad482dbb868e315e4a6dfc8355ef2 Signed-off-by: Anand B Jyoti --- VNFs/vACL/init.c | 7 ++++--- VNFs/vCGNAPT/init.c | 11 +++-------- VNFs/vFW/init.c | 5 +++-- 3 files changed, 10 insertions(+), 13 deletions(-) (limited to 'VNFs') 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 -- cgit 1.2.3-korg