[dpdk-dev] [PATCH] bonding: fix enumerated type mixed with another type

[dpdk-dev] [PATCH] bonding: fix enumerated type mixed with another type

[Tomasz Kulasek]

ICC complains about enumerated types being mixed in link bonding driver,
as ETH_MQ_RX_RSS is an enum type of mq_mode and not a bitmask as it was
being treated.

Fixes: 734ce47f71e0 ("bonding: support RSS dynamic configuration")

Signed-off-by: Tomasz Kulasek <tomaszx.kulasek@intel.com>
---
 drivers/net/bonding/rte_eth_bond_pmd.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c
index 500a1ee..2ec982b 100644
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -1311,7 +1311,7 @@ slave_configure(struct rte_eth_dev *bonded_eth_dev,
 		slave_eth_dev->data->dev_conf.intr_conf.lsc = 1;
 
 	/* If RSS is enabled for bonding, try to enable it for slaves  */
-	if (bonded_eth_dev->data->dev_conf.rxmode.mq_mode & ETH_MQ_RX_RSS) {
+	if (bonded_eth_dev->data->dev_conf.rxmode.mq_mode & ETH_MQ_RX_RSS_FLAG) {
 		if (bonded_eth_dev->data->dev_conf.rx_adv_conf.rss_conf.rss_key_len
 				!= 0) {
 			slave_eth_dev->data->dev_conf.rx_adv_conf.rss_conf.rss_key_len =
@@ -1324,7 +1324,8 @@ slave_configure(struct rte_eth_dev *bonded_eth_dev,
 
 		slave_eth_dev->data->dev_conf.rx_adv_conf.rss_conf.rss_hf =
 				bonded_eth_dev->data->dev_conf.rx_adv_conf.rss_conf.rss_hf;
-		slave_eth_dev->data->dev_conf.rxmode.mq_mode |= ETH_MQ_RX_RSS;
+		slave_eth_dev->data->dev_conf.rxmode.mq_mode =
+				bonded_eth_dev->data->dev_conf.rxmode.mq_mode;
 	}
 
 	/* Configure device */
-- 
1.7.9.5

Re: [dpdk-dev] [PATCH] bonding: fix enumerated type mixed with another type

[De Lara Guarch, Pablo]

> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Tomasz Kulasek
> Sent: Thursday, November 05, 2015 10:55 AM
> To: dev@dpdk.org
> Subject: [dpdk-dev] [PATCH] bonding: fix enumerated type mixed with
> another type
> 
> ICC complains about enumerated types being mixed in link bonding driver,
> as ETH_MQ_RX_RSS is an enum type of mq_mode and not a bitmask as it
> was
> being treated.
> 
> Fixes: 734ce47f71e0 ("bonding: support RSS dynamic configuration")
> 
> Signed-off-by: Tomasz Kulasek <tomaszx.kulasek@intel.com>

Acked-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>

Re: [dpdk-dev] [PATCH] bonding: fix enumerated type mixed with another type

[Thomas Monjalon]

> > ICC complains about enumerated types being mixed in link bonding driver,
> > as ETH_MQ_RX_RSS is an enum type of mq_mode and not a bitmask as it
> > was
> > being treated.
> > 
> > Fixes: 734ce47f71e0 ("bonding: support RSS dynamic configuration")
> > 
> > Signed-off-by: Tomasz Kulasek <tomaszx.kulasek@intel.com>
> 
> Acked-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>

Applied, thanks