From 2ef91ac05229b486e856b4994bd94a56ad5d4028 Mon Sep 17 00:00:00 2001
From: Alexey Fisher <bug-track@fisher-privat.net>
Date: Thu, 6 Nov 2008 09:51:16 +0100
Subject: [PATCH] --- yaml --- r: 122005 b: refs/heads/master c:
 3e4127fa6db34765685599fb8d1177e51850a63c h: refs/heads/master i:   122003:
 14448f36d316f917b58389da83c5c4c4e3bc2088 v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/net/wireless/ipw2200.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index c9741d25e18b..34fa015a4b14 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ffb826767bffda61426d964a8fc24a216a14b0bd
+refs/heads/master: 3e4127fa6db34765685599fb8d1177e51850a63c
diff --git a/trunk/drivers/net/wireless/ipw2200.c b/trunk/drivers/net/wireless/ipw2200.c
index 051ae92d8b65..6ca0f1c05048 100644
--- a/trunk/drivers/net/wireless/ipw2200.c
+++ b/trunk/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;
 	}