summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorTim Gardner <tim.gardner@canonical.com>2008-10-14 18:38:03 +0200
committerJohn W. Linville <linville@tuxdriver.com>2008-11-01 00:00:24 +0100
commit5c7f9b7363bfd10e40cf1a28dfc9048417df7028 (patch)
treed1e346e54767b1f8573255534f966b0d3dbc928e /Documentation
parentp54: implement MRR (diff)
downloadlinux-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 'Documentation')
-rw-r--r--Documentation/networking/README.ipw22002
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/networking/README.ipw2200 b/Documentation/networking/README.ipw2200
index 4f2a40f1dbc6..80c728522c4c 100644
--- a/Documentation/networking/README.ipw2200
+++ b/Documentation/networking/README.ipw2200
@@ -147,7 +147,7 @@ Where the supported parameter are:
driver. If disabled, the driver will not attempt to scan
for and associate to a network until it has been configured with
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