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 <doshir@vmware.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/vmxnet3/vmxnet3_ethtool.c b/drivers/net/vmxnet3/vmxnet3_ethtool.c
index 6acaafe169de3ae66d15f4efe52e40b9a92ee6cd..def27afa1c69fa2dffad1466894ccb5c00721725 100644 (file)
--- 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: