diff options
| author | Sascha Silbe <silbe@activitycentral.com> | 2011-05-11 14:52:34 +0200 |
|---|---|---|
| committer | Paul Fox <pgf@laptop.org> | 2012-05-02 14:04:37 -0400 |
| commit | bde819fe60fdc8ca7c7d6e0552105d0438cc7f89 (patch) | |
| tree | bcf8263fa87c1bc744ea89b6b58b0560ac00cf17 | |
| parent | 5d76efb5df8c6b1d181c47b17b1d1e9a39ef66b6 (diff) | |
| download | olpc-kernel-bde819fe60fdc8ca7c7d6e0552105d0438cc7f89.zip olpc-kernel-bde819fe60fdc8ca7c7d6e0552105d0438cc7f89.tar.gz olpc-kernel-bde819fe60fdc8ca7c7d6e0552105d0438cc7f89.tar.bz2 | |
libertas: Add libertas_disablemesh module parameter to disable mesh interface
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>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | drivers/net/wireless/libertas/main.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c index 3a90746..8132c5c 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. */ @@ -1085,7 +1089,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 + pr_info("%s: mesh disabled\n", dev->name); /* * While rtap isn't related to mesh, only mesh-enabled |