Commit 5c7f9b73 authored by Tim Gardner's avatar Tim Gardner Committed by John W. Linville
Browse files

ipw2x00: change default policy for auto-associate



Do not attempt association until directed to do so by a user space
application. In particular, this avoids race conditions with
NetworkManager association state.
Signed-off-by: default avatarTim Gardner <tim.gardner@canonical.com>
Acked-by: default avatarDan Williams <dcbw@redhat.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent c12abae3
...@@ -147,7 +147,7 @@ Where the supported parameter are: ...@@ -147,7 +147,7 @@ Where the supported parameter are:
driver. If disabled, the driver will not attempt to scan driver. If disabled, the driver will not attempt to scan
for and associate to a network until it has been configured with for and associate to a network until it has been configured with
one or more properties for the target network, for example configuring one or more properties for the target network, for example configuring
the network SSID. Default is 1 (auto-associate) the network SSID. Default is 0 (do not auto-associate)
Example: % modprobe ipw2200 associate=0 Example: % modprobe ipw2200 associate=0
......
...@@ -185,7 +185,7 @@ MODULE_LICENSE("GPL"); ...@@ -185,7 +185,7 @@ MODULE_LICENSE("GPL");
static int debug = 0; static int debug = 0;
static int mode = 0; static int mode = 0;
static int channel = 0; static int channel = 0;
static int associate = 1; static int associate = 0;
static int disable = 0; static int disable = 0;
#ifdef CONFIG_PM #ifdef CONFIG_PM
static struct ipw2100_fw ipw2100_firmware; static struct ipw2100_fw ipw2100_firmware;
...@@ -201,7 +201,7 @@ module_param(disable, int, 0444); ...@@ -201,7 +201,7 @@ module_param(disable, int, 0444);
MODULE_PARM_DESC(debug, "debug level"); MODULE_PARM_DESC(debug, "debug level");
MODULE_PARM_DESC(mode, "network mode (0=BSS,1=IBSS,2=Monitor)"); MODULE_PARM_DESC(mode, "network mode (0=BSS,1=IBSS,2=Monitor)");
MODULE_PARM_DESC(channel, "channel"); MODULE_PARM_DESC(channel, "channel");
MODULE_PARM_DESC(associate, "auto associate when scanning (default on)"); MODULE_PARM_DESC(associate, "auto associate when scanning (default off)");
MODULE_PARM_DESC(disable, "manually disable the radio (default 0 [radio on])"); MODULE_PARM_DESC(disable, "manually disable the radio (default 0 [radio on])");
static u32 ipw2100_debug_level = IPW_DL_NONE; static u32 ipw2100_debug_level = IPW_DL_NONE;
......
...@@ -87,7 +87,7 @@ static int channel = 0; ...@@ -87,7 +87,7 @@ static int channel = 0;
static int mode = 0; static int mode = 0;
static u32 ipw_debug_level; static u32 ipw_debug_level;
static int associate = 1; static int associate;
static int auto_create = 1; static int auto_create = 1;
static int led = 0; static int led = 0;
static int disable = 0; static int disable = 0;
...@@ -11913,7 +11913,7 @@ module_param(disable, int, 0444); ...@@ -11913,7 +11913,7 @@ module_param(disable, int, 0444);
MODULE_PARM_DESC(disable, "manually disable the radio (default 0 [radio on])"); MODULE_PARM_DESC(disable, "manually disable the radio (default 0 [radio on])");
module_param(associate, int, 0444); module_param(associate, int, 0444);
MODULE_PARM_DESC(associate, "auto associate when scanning (default on)"); MODULE_PARM_DESC(associate, "auto associate when scanning (default off)");
module_param(auto_create, int, 0444); module_param(auto_create, int, 0444);
MODULE_PARM_DESC(auto_create, "auto create adhoc network (default on)"); MODULE_PARM_DESC(auto_create, "auto create adhoc network (default on)");
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment