diff options
author | Scott J. Goldman <scottjg@vmware.com> | 2010-11-27 05:33:55 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-11-28 21:25:33 -0500 |
commit | e9248fbd6b6f7ef1917bfffe998654e40dfb4cfd (patch) | |
tree | 2b12b58bcefca5572e4bfb5d67cfb51d2886ac33 /drivers/net/vmxnet3 | |
parent | bf26414510103448ad3dc069c7422462f03ea3d7 (diff) |
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/net/vmxnet3')
-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 9ddaea636cfa..8e17fc8a7fe7 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, | |||
553 | return -EOPNOTSUPP; | 553 | return -EOPNOTSUPP; |
554 | } | 554 | } |
555 | 555 | ||
556 | 556 | #ifdef VMXNET3_RSS | |
557 | static int | 557 | static int |
558 | vmxnet3_get_rss_indir(struct net_device *netdev, | 558 | vmxnet3_get_rss_indir(struct net_device *netdev, |
559 | struct ethtool_rxfh_indir *p) | 559 | struct ethtool_rxfh_indir *p) |
@@ -598,6 +598,7 @@ vmxnet3_set_rss_indir(struct net_device *netdev, | |||
598 | return 0; | 598 | return 0; |
599 | 599 | ||
600 | } | 600 | } |
601 | #endif | ||
601 | 602 | ||
602 | static struct ethtool_ops vmxnet3_ethtool_ops = { | 603 | static struct ethtool_ops vmxnet3_ethtool_ops = { |
603 | .get_settings = vmxnet3_get_settings, | 604 | .get_settings = vmxnet3_get_settings, |
@@ -623,8 +624,10 @@ static struct ethtool_ops vmxnet3_ethtool_ops = { | |||
623 | .get_ringparam = vmxnet3_get_ringparam, | 624 | .get_ringparam = vmxnet3_get_ringparam, |
624 | .set_ringparam = vmxnet3_set_ringparam, | 625 | .set_ringparam = vmxnet3_set_ringparam, |
625 | .get_rxnfc = vmxnet3_get_rxnfc, | 626 | .get_rxnfc = vmxnet3_get_rxnfc, |
627 | #ifdef VMXNET3_RSS | ||
626 | .get_rxfh_indir = vmxnet3_get_rss_indir, | 628 | .get_rxfh_indir = vmxnet3_get_rss_indir, |
627 | .set_rxfh_indir = vmxnet3_set_rss_indir, | 629 | .set_rxfh_indir = vmxnet3_set_rss_indir, |
630 | #endif | ||
628 | }; | 631 | }; |
629 | 632 | ||
630 | void vmxnet3_set_ethtool_ops(struct net_device *netdev) | 633 | void vmxnet3_set_ethtool_ops(struct net_device *netdev) |