---

yaml --- r: 122005 b: refs/heads/master c: 3e4127f h: refs/heads/master i: 122003: 14448f3 v: v3
git-mirror · Nov 21, 2008 · 2ef91ac · 2ef91ac
1 parent 79b4159
commit 2ef91ac
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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;
 	}