aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/libertas/main.c
diff options
context:
space:
mode:
authorSascha Silbe <silbe@activitycentral.com>2011-05-11 08:52:34 -0400
committerJohn W. Linville <linville@tuxdriver.com>2011-05-11 15:12:19 -0400
commit6bdbdbf4a151a3a1333818cd17a7d7795e936041 (patch)
tree2810f1ad657162562706d0e90af9832c6406d175 /drivers/net/wireless/libertas/main.c
parenta8c485652ad4217800015aab25f1b70b96adb1a9 (diff)
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>
Diffstat (limited to 'drivers/net/wireless/libertas/main.c')
-rw-r--r--drivers/net/wireless/libertas/main.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index 84d05a765b5b..8c40949cb076 100644
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -36,6 +36,10 @@ unsigned int lbs_debug;
36EXPORT_SYMBOL_GPL(lbs_debug); 36EXPORT_SYMBOL_GPL(lbs_debug);
37module_param_named(libertas_debug, lbs_debug, int, 0644); 37module_param_named(libertas_debug, lbs_debug, int, 0644);
38 38
39unsigned int lbs_disablemesh;
40EXPORT_SYMBOL_GPL(lbs_disablemesh);
41module_param_named(libertas_disablemesh, lbs_disablemesh, int, 0644);
42
39 43
40/* 44/*
41 * This global structure is used to send the confirm_sleep command as 45 * This global structure is used to send the confirm_sleep command as
@@ -944,7 +948,10 @@ int lbs_start_card(struct lbs_private *priv)
944 948
945 lbs_update_channel(priv); 949 lbs_update_channel(priv);
946 950
947 lbs_init_mesh(priv); 951 if (!lbs_disablemesh)
952 lbs_init_mesh(priv);
953 else
954 pr_info("%s: mesh disabled\n", dev->name);
948 955
949 lbs_debugfs_init_one(priv, dev); 956 lbs_debugfs_init_one(priv, dev);
950 957