diff options
| author | Alexey Fisher <bug-track@fisher-privat.net> | 2008-11-06 09:51:16 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2008-11-21 11:06:06 -0500 |
| commit | 3e4127fa6db34765685599fb8d1177e51850a63c (patch) | |
| tree | 9aa655a3896648b0c02a12c288cd6ad30e321451 /drivers/net/wireless/ipw2200.c | |
| parent | ffb826767bffda61426d964a8fc24a216a14b0bd (diff) | |
ipw2200: make association only if SSID is known.
'iwconfig eth1 channel 6' would trigger association to _something_,
which is wrong. Changing the channel should (and does) trigger reassociation,
but only if there is an SSID to associate with.
Signed-off-by: Alexey Fisher <bug-track@fisher-privat.net>
Acked-by: Zhu Yi <yi.zhu@intel.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 | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c index 051ae92d8b6..6ca0f1c0504 100644 --- a/drivers/net/wireless/ipw2200.c +++ b/drivers/net/wireless/ipw2200.c @@ -7575,8 +7575,7 @@ static int ipw_associate(void *data) } if (!(priv->config & CFG_ASSOCIATE) && - !(priv->config & (CFG_STATIC_ESSID | - CFG_STATIC_CHANNEL | CFG_STATIC_BSSID))) { + !(priv->config & (CFG_STATIC_ESSID | CFG_STATIC_BSSID))) { IPW_DEBUG_ASSOC("Not attempting association (associate=0)\n"); return 0; } |