From: Ronak Doshi Date: Tue, 2 Jun 2020 03:02:39 +0000 (-0700) Subject: vmxnet3: allow rx flow hash ops only when rss is enabled X-Git-Tag: v5.8-rc1~165^2~3 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=11e877b2a8cfd282a1b81f9d4c594b900889a5d8;p=linux-2.6-block.git vmxnet3: allow rx flow hash ops only when rss is enabled It makes sense to allow changes to get/set rx flow hash callback only when rss is enabled. This patch restricts get_rss_hash_opts and set_rss_hash_opts methods to allow querying and configuring different Rx flow hash configurations only when rss is enabled Signed-off-by: Ronak Doshi Signed-off-by: David S. Miller --- diff --git a/drivers/net/vmxnet3/vmxnet3_ethtool.c b/drivers/net/vmxnet3/vmxnet3_ethtool.c index 6acaafe169de..def27afa1c69 100644 --- a/drivers/net/vmxnet3/vmxnet3_ethtool.c +++ b/drivers/net/vmxnet3/vmxnet3_ethtool.c @@ -899,6 +899,12 @@ vmxnet3_get_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *info, err = -EOPNOTSUPP; break; } +#ifdef VMXNET3_RSS + if (!adapter->rss) { + err = -EOPNOTSUPP; + break; + } +#endif err = vmxnet3_get_rss_hash_opts(adapter, info); break; default: @@ -919,6 +925,12 @@ vmxnet3_set_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *info) err = -EOPNOTSUPP; goto done; } +#ifdef VMXNET3_RSS + if (!adapter->rss) { + err = -EOPNOTSUPP; + goto done; + } +#endif switch (info->cmd) { case ETHTOOL_SRXFH: