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>

diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index 051ae92d8b65cd4253f39c27ecf5918b8ce157da..6ca0f1c050488b0a6f7bb41b8cb1753137809eb2 100644 (file)
--- 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;
        }