From: Bhavesh Davda <bhavesh@vmware•com>
To: Scott Goldman <scottjg@vmware•com>
Cc: "netdev@vger•kernel.org" <netdev@vger•kernel.org>,
"linux-kernel@vger•kernel.org" <linux-kernel@vger•kernel.org>,
"linux-next@vger•kernel.org" <linux-next@vger•kernel.org>,
"pv-drivers@vmware•com" <pv-drivers@vmware•com>,
"randy.dunlap@oracle•com" <randy.dunlap@oracle•com>
Subject: Re: [Pv-drivers] [PATCH] vmxnet3: fix compilation when RSS is disabled
Date: Sun, 28 Nov 2010 11:09:14 -0800 [thread overview]
Message-ID: <3522C779-FB58-4792-8ADE-80D826FB4606@vmware.com> (raw)
In-Reply-To: <1290890035-32285-2-git-send-email-scottjg@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
next prev parent reply other threads:[~2010-11-28 19:09 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-27 20:33 [PATCH net-next] vmxnet3: fix compilation when RSS is disabled Scott J. Goldman
2010-11-27 20:33 ` [PATCH] " Scott J. Goldman
2010-11-28 19:09 ` Bhavesh Davda [this message]
2010-11-29 2:26 ` David Miller
2010-11-29 3:07 ` Randy Dunlap
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3522C779-FB58-4792-8ADE-80D826FB4606@vmware.com \
--to=bhavesh@vmware$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=pv-drivers@vmware$(echo .)com \
--cc=randy.dunlap@oracle$(echo .)com \
--cc=scottjg@vmware$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox