From: Helin Zhang Date: Wed, 21 Oct 2015 23:47:13 +0000 (-0400) Subject: i40e: return the number of enabled queues for ETHTOOL_GRXRINGS X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3e3aa21fe9265bdc45ff795dbcc90bcdd2f1017c;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git i40e: return the number of enabled queues for ETHTOOL_GRXRINGS 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 Tested-by: Andrew Bowers Signed-off-by: Jeff Kirsher --- diff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c index eeb1af4885b2..a89da8a22092 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c +++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c @@ -2111,7 +2111,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: