From: Sascha Silbe <silbe@activitycentral.com>
To: linux-wireless@vger.kernel.org
Cc: libertas-dev@lists.infradead.org, Dan Williams <dcbw@redhat.com>,
netdev@vger.kernel.org,
"John W. Linville" <linville@tuxdriver.com>,
linux-kernel@vger.kernel.org, devel@lists.laptop.org
Subject: [PATCH] Add libertas_disablemesh module parameter to disable mesh interface
Date: Wed, 11 May 2011 14:52:34 +0200 [thread overview]
Message-ID: <1305118354-17337-1-git-send-email-silbe@activitycentral.com> (raw)
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 <pgf@laptop.org>.
Signed-off-by: Sascha Silbe <silbe@activitycentral.com>
---
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.
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
--
1.7.4.1
next reply other threads:[~2011-05-11 12:52 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-11 12:52 Sascha Silbe [this message]
2011-05-11 17:00 ` [PATCH] Add libertas_disablemesh module parameter to disable mesh interface Randy Dunlap
[not found] ` <20110511100030.cad34893.rdunlap-/UHa2rfvQTnk1uMJSBkQmQ@public.gmane.org>
2011-05-13 13:26 ` Sascha Silbe
2011-05-12 3:11 ` Dan Williams
2011-05-13 13:16 ` Sascha Silbe
2011-05-19 17:16 ` Dan Williams
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=1305118354-17337-1-git-send-email-silbe@activitycentral.com \
--to=silbe@activitycentral.com \
--cc=dcbw@redhat.com \
--cc=devel@lists.laptop.org \
--cc=libertas-dev@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).