From patchwork Wed May 11 12:52:34 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sascha Silbe X-Patchwork-Id: 95169 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 C42ED1007DA for ; Thu, 12 May 2011 02:57:03 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757804Ab1EKQxT (ORCPT ); Wed, 11 May 2011 12:53:19 -0400 Received: from p15132773.pureserver.info ([217.160.209.225]:58098 "EHLO smtp.chost.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1757805Ab1EKQxP (ORCPT ); Wed, 11 May 2011 12:53:15 -0400 Received: (qmail 25181 invoked by uid 5015); 11 May 2011 12:53:03 -0000 Received: (nullmailer pid 25583 invoked by uid 123); Wed, 11 May 2011 12:53:09 -0000 Received: from twin.sascha.silbe.org (twin.sascha.silbe.org [192.168.1.2]) by flatty.sascha.silbe.org ([192.168.1.252]) with SMTP via TCP; 11 May 2011 12:53:09 -0000 Received: (nullmailer pid 17372 invoked by uid 8193); Wed, 11 May 2011 12:53:08 -0000 From: Sascha Silbe To: linux-wireless@vger.kernel.org Cc: devel@lists.laptop.org, Dan Williams , "John W. Linville" , libertas-dev@lists.infradead.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] Add libertas_disablemesh module parameter to disable mesh interface Date: Wed, 11 May 2011 14:52:34 +0200 Message-Id: <1305118354-17337-1-git-send-email-silbe@activitycentral.com> X-Mailer: git-send-email 1.7.4.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This allows individual users and deployments to disable mesh support at runtime, i.e. without having to build and maintain a custom kernel. Based on a patch by Paul Fox . Signed-off-by: Sascha Silbe --- drivers/net/wireless/libertas/main.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) The patch is based on the OLPC 2.6.35 kernel tree, but applies cleanly to wireless-next. -- 1.7.4.1 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c index 8445473..62069e2 100644 --- a/drivers/net/wireless/libertas/main.c +++ b/drivers/net/wireless/libertas/main.c @@ -41,6 +41,10 @@ unsigned int lbs_debug; EXPORT_SYMBOL_GPL(lbs_debug); module_param_named(libertas_debug, lbs_debug, int, 0644); +unsigned int lbs_disablemesh; +EXPORT_SYMBOL_GPL(lbs_disablemesh); +module_param_named(libertas_disablemesh, lbs_disablemesh, int, 0644); + /* This global structure is used to send the confirm_sleep command as * fast as possible down to the firmware. */ @@ -1086,7 +1090,10 @@ int lbs_start_card(struct lbs_private *priv) lbs_update_channel(priv); - lbs_init_mesh(priv); + if (!lbs_disablemesh) + lbs_init_mesh(priv); + else + lbs_pr_info("%s: mesh disabled\n", dev->name); /* * While rtap isn't related to mesh, only mesh-enabled