Commit 3e4127fa authored by Alexey Fisher's avatar Alexey Fisher Committed by John W. Linville

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: default avatarAlexey Fisher <bug-track@fisher-privat.net>
Acked-by: default avatarZhu Yi <yi.zhu@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent ffb82676
...@@ -7575,8 +7575,7 @@ static int ipw_associate(void *data) ...@@ -7575,8 +7575,7 @@ static int ipw_associate(void *data)
} }
if (!(priv->config & CFG_ASSOCIATE) && if (!(priv->config & CFG_ASSOCIATE) &&
!(priv->config & (CFG_STATIC_ESSID | !(priv->config & (CFG_STATIC_ESSID | CFG_STATIC_BSSID))) {
CFG_STATIC_CHANNEL | CFG_STATIC_BSSID))) {
IPW_DEBUG_ASSOC("Not attempting association (associate=0)\n"); IPW_DEBUG_ASSOC("Not attempting association (associate=0)\n");
return 0; return 0;
} }
......
Markdown is supported
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