Skip to content

Commit

Permalink
ipw2200: make association only if SSID is known.
Browse files Browse the repository at this point in the history
'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>
  • Loading branch information
Alexey Fisher authored and John W. Linville committed Nov 21, 2008
1 parent ffb8267 commit 3e4127f
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions drivers/net/wireless/ipw2200.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit 3e4127f

Please sign in to comment.