bnxt_en: Return correct RSS indirection table entries to ethtool -x.

Now that we have the logical indirection table, we can return these
proper logical indices directly to ethtool -x instead of the physical
IDs.

Reported-by: Jakub Kicinski <kicinski@fb.com>
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
index 995de937358abf884b366eeed7ad4d4e53a62b2d..1fe7c61042f474ed561d31beb6584bb946347e68 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
@@ -1292,7 +1292,7 @@ static int bnxt_get_rxfh(struct net_device *dev, u32 *indir, u8 *key,
 {
        struct bnxt *bp = netdev_priv(dev);
        struct bnxt_vnic_info *vnic;
-       int i = 0;
+       u32 i, tbl_size;
 
        if (hfunc)
                *hfunc = ETH_RSS_HASH_TOP;
@@ -1301,9 +1301,10 @@ static int bnxt_get_rxfh(struct net_device *dev, u32 *indir, u8 *key,
                return 0;
 
        vnic = &bp->vnic_info[0];
-       if (indir && vnic->rss_table) {
-               for (i = 0; i < HW_HASH_INDEX_SIZE; i++)
-                       indir[i] = le16_to_cpu(vnic->rss_table[i]);
+       if (indir && bp->rss_indir_tbl) {
+               tbl_size = bnxt_get_rxfh_indir_size(dev);
+               for (i = 0; i < tbl_size; i++)
+                       indir[i] = bp->rss_indir_tbl[i];
        }
 
        if (key && vnic->rss_hash_key)