diff options
author | Scott J. Goldman <scottjg@vmware.com> | 2010-11-27 10:33:55 +0000 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-11-28 18:25:33 -0800 |
commit | e9248fbd6b6f7ef1917bfffe998654e40dfb4cfd (patch) | |
tree | 2b12b58bcefca5572e4bfb5d67cfb51d2886ac33 /drivers | |
parent | bf26414510103448ad3dc069c7422462f03ea3d7 (diff) | |
download | op-kernel-dev-e9248fbd6b6f7ef1917bfffe998654e40dfb4cfd.zip op-kernel-dev-e9248fbd6b6f7ef1917bfffe998654e40dfb4cfd.tar.gz |
vmxnet3: fix compilation when RSS is disabled
If RSS is disabled, we can ifdef out some RSS specific code. This fixes
the compile error found by Randy Dunlap.
Signed-off-by: Scott J. Goldman <scottjg@vmware.com>
Reviewed-by: Bhavesh Davda <bhavesh@vmware.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/vmxnet3/vmxnet3_ethtool.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/vmxnet3/vmxnet3_ethtool.c b/drivers/net/vmxnet3/vmxnet3_ethtool.c index 9ddaea6..8e17fc8 100644 --- a/drivers/net/vmxnet3/vmxnet3_ethtool.c +++ b/drivers/net/vmxnet3/vmxnet3_ethtool.c @@ -553,7 +553,7 @@ vmxnet3_get_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *info, return -EOPNOTSUPP; } - +#ifdef VMXNET3_RSS static int vmxnet3_get_rss_indir(struct net_device *netdev, struct ethtool_rxfh_indir *p) @@ -598,6 +598,7 @@ vmxnet3_set_rss_indir(struct net_device *netdev, return 0; } +#endif static struct ethtool_ops vmxnet3_ethtool_ops = { .get_settings = vmxnet3_get_settings, @@ -623,8 +624,10 @@ static struct ethtool_ops vmxnet3_ethtool_ops = { .get_ringparam = vmxnet3_get_ringparam, .set_ringparam = vmxnet3_set_ringparam, .get_rxnfc = vmxnet3_get_rxnfc, +#ifdef VMXNET3_RSS .get_rxfh_indir = vmxnet3_get_rss_indir, .set_rxfh_indir = vmxnet3_set_rss_indir, +#endif }; void vmxnet3_set_ethtool_ops(struct net_device *netdev) |