[PATCH net-next v3 5/8] bnxt_en: Return correct RSS indirection table entries to ethtool -x.

[Michael Chan]

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

v3: Use ALIGN() to round up the RSS table size.

Reported-by: Jakub Kicinski <kicin...@fb.com>
Signed-off-by: Michael Chan <michael.c...@broadcom.com>
---
 drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c 
b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
index 6b88143..8bc4a7f 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
@@ -1275,6 +1275,10 @@ static int bnxt_set_rxnfc(struct net_device *dev, struct 
ethtool_rxnfc *cmd)
 
 static u32 bnxt_get_rxfh_indir_size(struct net_device *dev)
 {
+       struct bnxt *bp = netdev_priv(dev);
+
+       if (bp->flags & BNXT_FLAG_CHIP_P5)
+               return ALIGN(bp->rx_nr_rings, BNXT_RSS_TABLE_ENTRIES_P5);
        return HW_HASH_INDEX_SIZE;
 }
 
@@ -1288,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;
@@ -1297,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)
-- 
1.8.3.1