From patchwork Tue May 17 19:34:20 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Randy Dunlap X-Patchwork-Id: 792222 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p4HJZ3ug007930 for ; Tue, 17 May 2011 19:35:03 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932151Ab1EQTes (ORCPT ); Tue, 17 May 2011 15:34:48 -0400 Received: from rcsinet10.oracle.com ([148.87.113.121]:37433 "EHLO rcsinet10.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932087Ab1EQTer (ORCPT ); Tue, 17 May 2011 15:34:47 -0400 Received: from rtcsinet21.oracle.com (rtcsinet21.oracle.com [66.248.204.29]) by rcsinet10.oracle.com (Switch-3.4.2/Switch-3.4.2) with ESMTP id p4HJYU23005655 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 17 May 2011 19:34:32 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by rtcsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id p4HJYSLl012821 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 17 May 2011 19:34:28 GMT Received: from abhmt017.oracle.com (abhmt017.oracle.com [141.146.116.26]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id p4HJYLZb018826; Tue, 17 May 2011 14:34:21 -0500 Received: from chimera.site (/50.53.38.135) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 17 May 2011 12:34:21 -0700 Date: Tue, 17 May 2011 12:34:20 -0700 From: Randy Dunlap To: Stephen Rothwell , linux-wireless@vger.kernel.org Cc: linux-next@vger.kernel.org, LKML , linville@tuxdriver.com Subject: [PATCH -next] wireless: improve airo when PROC_FS is disabled Message-Id: <20110517123420.68f4288d.randy.dunlap@oracle.com> In-Reply-To: <20110517142749.8927b65b.sfr@canb.auug.org.au> References: <20110517142749.8927b65b.sfr@canb.auug.org.au> Organization: Oracle Linux Eng. X-Mailer: Sylpheed 2.7.1 (GTK+ 2.16.6; x86_64-unknown-linux-gnu) Mime-Version: 1.0 X-Source-IP: rtcsinet21.oracle.com [66.248.204.29] X-CT-RefId: str=0001.0A090208.4DD2CDCA.00CB:SCFSTAT5015188,ss=1,fgs=0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Tue, 17 May 2011 19:35:03 +0000 (UTC) From: Randy Dunlap Skip all of the procfs-related calls when PROC_FS is not enabled. Signed-off-by: Randy Dunlap --- drivers/net/wireless/airo.c | 7 +++++++ 1 file changed, 7 insertions(+) -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- linux-next-20110517.orig/drivers/net/wireless/airo.c +++ linux-next-20110517/drivers/net/wireless/airo.c @@ -4496,6 +4496,7 @@ struct proc_data { void (*on_close) (struct inode *, struct file *); }; +#ifdef CONFIG_PROC_FS static int setup_proc_entry( struct net_device *dev, struct airo_info *apriv ) { struct proc_dir_entry *entry; @@ -4593,6 +4594,12 @@ fail_stats_delta: fail: return -ENOMEM; } +#else +static int setup_proc_entry( struct net_device *dev, + struct airo_info *apriv ) { + return 0; +} +#endif static int takedown_proc_entry( struct net_device *dev, struct airo_info *apriv ) {