From 9618b5c6ec9cd1b1f2de4109816c29d22dfddee3 Mon Sep 17 00:00:00 2001 From: "John W. Linville" Date: Wed, 27 Jan 2010 14:23:17 -0500 Subject: [PATCH] --- yaml --- r: 183917 b: refs/heads/master c: d3d5621abf6d2105700795fcbdf784b9cb46b495 h: refs/heads/master i: 183915: bb8e3ca2c08e0aaa2ab5eaffa3a496e42eddb7fb v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/libertas/assoc.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 757130c03693..ebf78eab0a10 100644 --- 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 index 0979b07799a0..f03d5e4e59c3 100644 --- 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);