From 6343a9a2e53ea9847c1ceeb76b6ce0e8559eb2b5 Mon Sep 17 00:00:00 2001 From: "Scott J. Goldman" Date: Sat, 27 Nov 2010 10:33:55 +0000 Subject: [PATCH] --- yaml --- r: 224541 b: refs/heads/master c: e9248fbd6b6f7ef1917bfffe998654e40dfb4cfd h: refs/heads/master i: 224539: 5262e016dc1fac1332037e2f0e377325ec441846 v: v3 --- [refs] | 2 +- trunk/drivers/net/vmxnet3/vmxnet3_ethtool.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index eb09259ddf77..d1470b8e83f9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bf26414510103448ad3dc069c7422462f03ea3d7 +refs/heads/master: e9248fbd6b6f7ef1917bfffe998654e40dfb4cfd diff --git a/trunk/drivers/net/vmxnet3/vmxnet3_ethtool.c b/trunk/drivers/net/vmxnet3/vmxnet3_ethtool.c index 9ddaea636cfa..8e17fc8a7fe7 100644 --- a/trunk/drivers/net/vmxnet3/vmxnet3_ethtool.c +++ b/trunk/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)