Re: [Pv-drivers] [PATCH] vmxnet3: fix compilation when RSS is disabled

[Bhavesh Davda <bhavesh@vmware.com>]

Straightforward enough. Thanks for fixing this Scott!


On Nov 27, 2010, at 12:35 PM, "Scott J. Goldman" <scottjg@vmware.com> 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@vmware.com>

Reviewed-by: Bhavesh Davda <bhavesh@vmware.com>

> ---
> 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)
> -- 
> 1.7.0.4
> 
> _______________________________________________
> Pv-drivers mailing list
> Pv-drivers@vmware.com
> http://mailman2.vmware.com/mailman/listinfo/pv-drivers