bonding: fix build with icc
authorTomasz Kulasek <tomaszx.kulasek@intel.com>
Thu, 5 Nov 2015 10:55:07 +0000 (11:55 +0100)
committerThomas Monjalon <thomas.monjalon@6wind.com>
Wed, 11 Nov 2015 23:22:26 +0000 (00:22 +0100)
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>
drivers/net/bonding/rte_eth_bond_pmd.c

index bbff664..839ba90 100644 (file)
@@ -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 */