Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754065Ab0K1TJF (ORCPT ); Sun, 28 Nov 2010 14:09:05 -0500 Received: from smtp-outbound-1.vmware.com ([65.115.85.69]:28373 "EHLO smtp-outbound-1.vmware.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753929Ab0K1TJD convert rfc822-to-8bit (ORCPT ); Sun, 28 Nov 2010 14:09:03 -0500 From: Bhavesh Davda To: Scott Goldman CC: "netdev@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "linux-next@vger.kernel.org" , "pv-drivers@vmware.com" , "randy.dunlap@oracle.com" Date: Sun, 28 Nov 2010 11:09:14 -0800 Subject: Re: [Pv-drivers] [PATCH] vmxnet3: fix compilation when RSS is disabled Thread-Topic: [Pv-drivers] [PATCH] vmxnet3: fix compilation when RSS is disabled Thread-Index: AcuPL7b40/DPdyPgQ9W+I69/kzrtzg== Message-ID: <3522C779-FB58-4792-8ADE-80D826FB4606@vmware.com> References: <1290890035-32285-1-git-send-email-scottjg@vmware.com> <1290890035-32285-2-git-send-email-scottjg@vmware.com> In-Reply-To: <1290890035-32285-2-git-send-email-scottjg@vmware.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1990 Lines: 60 Straightforward enough. Thanks for fixing this Scott! On Nov 27, 2010, at 12:35 PM, "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 Reviewed-by: Bhavesh Davda > --- > 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/