Return-path: Received: from mail.gmx.net ([213.165.64.20]:56552 "HELO mail.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1754789AbYKDWBp (ORCPT ); Tue, 4 Nov 2008 17:01:45 -0500 From: Alexey Fisher To: linux-wireless@vger.kernel.org Cc: linville@tuxdriver.com, rjw@sisk.pl, kernel-testers@vger.kernel.org, Alexey Fisher Subject: [PATCH] make assocaittion only if SSID is known. Date: Tue, 4 Nov 2008 23:01:41 +0100 Message-Id: <1225836101-5723-1-git-send-email-bug-track@fisher-privat.net> (sfid-20081104_230150_680239_C3FE7BE6) Sender: linux-wireless-owner@vger.kernel.org List-ID: '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! --- 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 dcce354..d26beed 100644 --- a/drivers/net/wireless/ipw2200.c +++ b/drivers/net/wireless/ipw2200.c @@ -7581,8 +7581,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; } -- 1.5.6.3