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 <[email protected]>.
Signed-off-by: Sascha Silbe <[email protected]>
Signed-off-by: John W. Linville <[email protected]>

diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index 84d05a765b5b876a17feab8e8ae85b2cc505ad6c..8c40949cb0769edef3620cc8ecaa82ce86d8d6d9 100644 (file)
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -36,6 +36,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
@@ -944,7 +948,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);
 
        lbs_debugfs_init_one(priv, dev);