From: Helin Zhang <helin.zhang@intel.com>
Date: Wed, 21 Oct 2015 23:47:13 +0000 (-0400)
Subject: i40e: return the number of enabled queues for ETHTOOL_GRXRINGS
X-Git-Tag: v4.1.12-92~189^2~222
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=83910c1840f0b7e32a14bd1301ac597250c6a9f2;p=users%2Fjedix%2Flinux-maple.git

i40e: return the number of enabled queues for ETHTOOL_GRXRINGS

Orabug: 22342532

This patch fixes a problem where using ethtool rxnfc command could
let RX flow hash be set on disabled queues. This patch fixes the
problem by returning the number of enabled queues before setting
rxnfc.

Change-ID: Idbac86b0b47ddacc8deee7cd257e41de01cbe5c0
Signed-off-by: Helin Zhang <helin.zhang@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit 3e3aa21fe9265bdc45ff795dbcc90bcdd2f1017c)
Signed-off-by: Brian Maly <brian.maly@oracle.com>
---

diff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
index 9d1e240fd5249..e5ce1ef20aa19 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
@@ -2106,7 +2106,7 @@ static int i40e_get_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *cmd,
 
 	switch (cmd->cmd) {
 	case ETHTOOL_GRXRINGS:
-		cmd->data = vsi->alloc_queue_pairs;
+		cmd->data = vsi->num_queue_pairs;
 		ret = 0;
 		break;
 	case ETHTOOL_GRXFH: