net/bnxt: fix RSS behavior on Thor

[dpdk.git] / drivers / net / bnxt / rte_pmd_bnxt.c

diff --git a/drivers/net/bnxt/rte_pmd_bnxt.c b/drivers/net/bnxt/rte_pmd_bnxt.c
index eafc1d3..77ecbef 100644 (file)
--- a/drivers/net/bnxt/rte_pmd_bnxt.c
+++ b/drivers/net/bnxt/rte_pmd_bnxt.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2017-2018 Broadcom
+ * Copyright(c) 2017-2021 Broadcom
  * All rights reserved.
  */
 
@@ -8,7 +8,7 @@
 #include <unistd.h>
 
 #include <rte_dev.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 #include <rte_cycles.h>
 #include <rte_byteorder.h>
@@ -28,8 +28,8 @@ int bnxt_rcv_msg_from_vf(struct bnxt *bp, uint16_t vf_id, void *msg)
        ret_param.vf_id = vf_id;
        ret_param.msg = msg;
 
-       _rte_eth_dev_callback_process(bp->eth_dev, RTE_ETH_EVENT_VF_MBOX,
-                                     &ret_param);
+       rte_eth_dev_callback_process(bp->eth_dev, RTE_ETH_EVENT_VF_MBOX,
+                                    &ret_param);
 
        /* Default to approve */
        if (ret_param.retval == RTE_PMD_BNXT_MB_EVENT_PROCEED)
@@ -421,18 +421,18 @@ int rte_pmd_bnxt_set_vf_rxmode(uint16_t port, uint16_t vf,
        if (vf >= bp->pdev->max_vfs)
                return -EINVAL;
 
-       if (rx_mask & ETH_VMDQ_ACCEPT_UNTAG) {
+       if (rx_mask & RTE_ETH_VMDQ_ACCEPT_UNTAG) {
                PMD_DRV_LOG(ERR, "Currently cannot toggle this setting\n");
                return -ENOTSUP;
        }
 
        /* Is this really the correct mapping?  VFd seems to think it is. */
-       if (rx_mask & ETH_VMDQ_ACCEPT_HASH_UC)
+       if (rx_mask & RTE_ETH_VMDQ_ACCEPT_HASH_UC)
                flag |= BNXT_VNIC_INFO_PROMISC;
 
-       if (rx_mask & ETH_VMDQ_ACCEPT_BROADCAST)
+       if (rx_mask & RTE_ETH_VMDQ_ACCEPT_BROADCAST)
                flag |= BNXT_VNIC_INFO_BCAST;
-       if (rx_mask & ETH_VMDQ_ACCEPT_MULTICAST)
+       if (rx_mask & RTE_ETH_VMDQ_ACCEPT_MULTICAST)
                flag |= BNXT_VNIC_INFO_ALLMULTI | BNXT_VNIC_INFO_MCAST;
 
        if (on)