[PATCH] libertas: Make WPA work through supplicant handshake

Fix WPA so it works up through the supplicant 4-Way handshake process.
Doesn't successfully pass traffic yet; may be problems installing
the GTK to the firmware.

- RSN needs to be enabled before the association command is sent
- Use keys from the association request not the adapter structure
- cmd_act_mac_strict_protection_enable != IW_AUTH_DROP_UNENCRYPTED
- Fix network filtering logic in is_network_compatible() WPA helpers

Signed-off-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 10 insertions, 10 deletions

diff --git a/drivers/net/wireless/libertas/assoc.c b/drivers/net/wireless/libertas/assoc.c
index 48fc6d171d58..2ee38a25adef 100644
--- a/drivers/net/wireless/libertas/assoc.c
+++ b/drivers/net/wireless/libertas/assoc.c
@@ -347,7 +347,17 @@ static int assoc_helper_secinfo(wlan_private *priv,
                 sizeof(struct wlan_802_11_security));
 
         ret = libertas_set_mac_packet_filter(priv);
+        if (ret)
+                goto out;
 
+        /* enable/disable RSN */
+        ret = libertas_prepare_and_send_command(priv,
+                                    cmd_802_11_enable_rsn,
+                                    cmd_act_set,
+                                    cmd_option_waitforrsp,
+                                    0, assoc_req);
+
+out:
         lbs_deb_leave_args(LBS_DEB_ASSOC, "ret %d", ret);
         return ret;
 }
@@ -360,22 +370,12 @@ static int assoc_helper_wpa_keys(wlan_private *priv,
 
         lbs_deb_enter(LBS_DEB_ASSOC);
 
-        /* enable/Disable RSN */
-        ret = libertas_prepare_and_send_command(priv,
-                                    cmd_802_11_enable_rsn,
-                                    cmd_act_set,
-                                    cmd_option_waitforrsp,
-                                    0, assoc_req);
-        if (ret)
-                goto out;
-
         ret = libertas_prepare_and_send_command(priv,
                                     cmd_802_11_key_material,
                                     cmd_act_set,
                                     cmd_option_waitforrsp,
                                     0, assoc_req);
 
-out:
         lbs_deb_leave_args(LBS_DEB_ASSOC, "ret %d", ret);
         return ret;
 }