[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <4CF318F3.7040600@oracle.com>
Date: Sun, 28 Nov 2010 19:07:31 -0800
From: Randy Dunlap <randy.dunlap@...cle.com>
To: "Scott J. Goldman" <scottjg@...are.com>
CC: netdev@...r.kernel.org, linux-kernel@...r.kernel.org,
linux-next@...r.kernel.org, pv-drivers@...are.com
Subject: Re: [PATCH] vmxnet3: fix compilation when RSS is disabled
On 11/27/10 12:33, Scott J. Goldman wrote:
> 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@...are.com>
Acked-by: Randy Dunlap <randy.dunlap@...cle.com>
Thanks.
> ---
> 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)
--
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists