Commit 1625c148 authored by Samuel Ortiz's avatar Samuel Ortiz Committed by John W. Linville

libertas: Set/clear WPA keys before the WEP ones

With the v10 firmware running on 8688 HW, clearing WPA keys after setting the
WEP key prevents us from being able to associate with WEP APs.
Swapping the calling order for assoc_helper_wpa_keys() and
assoc_helper_wep_keys fixes that issue.
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent de9a47f9
...@@ -2052,13 +2052,6 @@ void lbs_association_worker(struct work_struct *work) ...@@ -2052,13 +2052,6 @@ void lbs_association_worker(struct work_struct *work)
goto out; goto out;
} }
if ( test_bit(ASSOC_FLAG_WEP_KEYS, &assoc_req->flags)
|| test_bit(ASSOC_FLAG_WEP_TX_KEYIDX, &assoc_req->flags)) {
ret = assoc_helper_wep_keys(priv, assoc_req);
if (ret)
goto out;
}
if (test_bit(ASSOC_FLAG_SECINFO, &assoc_req->flags)) { if (test_bit(ASSOC_FLAG_SECINFO, &assoc_req->flags)) {
ret = assoc_helper_secinfo(priv, assoc_req); ret = assoc_helper_secinfo(priv, assoc_req);
if (ret) if (ret)
...@@ -2078,6 +2071,14 @@ void lbs_association_worker(struct work_struct *work) ...@@ -2078,6 +2071,14 @@ void lbs_association_worker(struct work_struct *work)
goto out; goto out;
} }
if ( test_bit(ASSOC_FLAG_WEP_KEYS, &assoc_req->flags)
|| test_bit(ASSOC_FLAG_WEP_TX_KEYIDX, &assoc_req->flags)) {
ret = assoc_helper_wep_keys(priv, assoc_req);
if (ret)
goto out;
}
/* SSID/BSSID should be the _last_ config option set, because they /* SSID/BSSID should be the _last_ config option set, because they
* trigger the association attempt. * trigger the association attempt.
*/ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment