From patchwork Sat Nov 27 20:33:55 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Scott J. Goldman" X-Patchwork-Id: 73298 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 63C28B70B0 for ; Sun, 28 Nov 2010 07:35:44 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753508Ab0K0UfU (ORCPT ); Sat, 27 Nov 2010 15:35:20 -0500 Received: from smtp-outbound-2.vmware.com ([65.115.85.73]:25183 "EHLO smtp-outbound-2.vmware.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753403Ab0K0UfT (ORCPT ); Sat, 27 Nov 2010 15:35:19 -0500 Received: from mailhost3.vmware.com (mailhost3.vmware.com [10.16.27.45]) by smtp-outbound-2.vmware.com (Postfix) with ESMTP id 07CE448010; Sat, 27 Nov 2010 12:35:19 -0800 (PST) Received: from localhost.localdomain (scottjg-dev.eng.vmware.com [10.20.118.44]) by mailhost3.vmware.com (Postfix) with ESMTP id EE163CD957; Sat, 27 Nov 2010 12:35:18 -0800 (PST) From: "Scott J. Goldman" To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-next@vger.kernel.org Cc: pv-drivers@vmware.com, randy.dunlap@oracle.com, "Scott J. Goldman" Subject: [PATCH] vmxnet3: fix compilation when RSS is disabled Date: Sat, 27 Nov 2010 12:33:55 -0800 Message-Id: <1290890035-32285-2-git-send-email-scottjg@vmware.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1290890035-32285-1-git-send-email-scottjg@vmware.com> References: <1290890035-32285-1-git-send-email-scottjg@vmware.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 Acked-by: Randy Dunlap --- 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)