diff options
| author | Tim Gardner <tim.gardner@canonical.com> | 2008-10-14 18:38:03 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2008-11-01 00:00:24 +0100 |
| commit | 5c7f9b7363bfd10e40cf1a28dfc9048417df7028 (patch) | |
| tree | d1e346e54767b1f8573255534f966b0d3dbc928e /drivers/net/wireless/ipw2200.c | |
| parent | p54: implement MRR (diff) | |
| download | linux-5c7f9b7363bfd10e40cf1a28dfc9048417df7028.tar.xz linux-5c7f9b7363bfd10e40cf1a28dfc9048417df7028.zip | |
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: Tim Gardner <tim.gardner@canonical.com>
Acked-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ipw2200.c')
| -rw-r--r-- | drivers/net/wireless/ipw2200.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c index 13633d8274a3..6ec6de2960ee 100644 --- a/drivers/net/wireless/ipw2200.c +++ b/drivers/net/wireless/ipw2200.c @@ -87,7 +87,7 @@ static int channel = 0; static int mode = 0; static u32 ipw_debug_level; -static int associate = 1; +static int associate; static int auto_create = 1; static int led = 0; static int disable = 0; @@ -11913,7 +11913,7 @@ module_param(disable, int, 0444); MODULE_PARM_DESC(disable, "manually disable the radio (default 0 [radio on])"); 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_PARM_DESC(auto_create, "auto create adhoc network (default on)"); |