aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/ipw2200.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index 051ae92d8b65..6ca0f1c05048 100644
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -7575,8 +7575,7 @@ static int ipw_associate(void *data)
7575 } 7575 }
7576 7576
7577 if (!(priv->config & CFG_ASSOCIATE) && 7577 if (!(priv->config & CFG_ASSOCIATE) &&
7578 !(priv->config & (CFG_STATIC_ESSID | 7578 !(priv->config & (CFG_STATIC_ESSID | CFG_STATIC_BSSID))) {
7579 CFG_STATIC_CHANNEL | CFG_STATIC_BSSID))) {
7580 IPW_DEBUG_ASSOC("Not attempting association (associate=0)\n"); 7579 IPW_DEBUG_ASSOC("Not attempting association (associate=0)\n");
7581 return 0; 7580 return 0;
7582 } 7581 }