---

yaml --- r: 183917 b: refs/heads/master c: d3d5621 h: refs/heads/master i: 183915: bb8e3ca v: v3
git-mirror · Jan 27, 2010 · 9618b5c · 9618b5c
1 parent 44851c7
commit 9618b5c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 47db3a677b533489d1a5a027282aa33f46dffa79
+refs/heads/master: d3d5621abf6d2105700795fcbdf784b9cb46b495
diff --git a/trunk/drivers/net/wireless/libertas/assoc.c b/trunk/drivers/net/wireless/libertas/assoc.c
@@ -2062,6 +2062,11 @@ void lbs_association_worker(struct work_struct *work)
 			goto out;
 	}
 
+	/*
+	 * v10 FW wants WPA keys to be set/cleared before WEP key operations,
+	 * otherwise it will fail to correctly associate to WEP networks.
+	 * Other firmware versions don't appear to care.
+	 */
 	if (test_bit(ASSOC_FLAG_WPA_MCAST_KEY, &assoc_req->flags) ||
 	    test_bit(ASSOC_FLAG_WPA_UCAST_KEY, &assoc_req->flags)) {
 		ret = assoc_helper_wpa_keys(priv, assoc_req);