Ticket #7825: 0001-libertas-Reduce-the-WPA-key-installation-time.patch

drivers/net/wireless/libertas/assoc.c

@@ -358 +358 @@
 
         if (test_bit(ASSOC_FLAG_WPA_UCAST_KEY, &assoc_req->flags)) {
                 clear_bit(ASSOC_FLAG_WPA_MCAST_KEY, &assoc_req->flags);
-                ret = lbs_prepare_and_send_command(priv,
-                                        CMD_802_11_KEY_MATERIAL,
-                                        CMD_ACT_SET,
-                                        CMD_OPTION_WAITFORRSP,
-                                        0, assoc_req);
+                ret = lbs_set_key_material(priv, &assoc_req->wpa_unicast_key);
                 assoc_req->flags = flags;
         }
 
@@ -372 +368 @@
         if (test_bit(ASSOC_FLAG_WPA_MCAST_KEY, &assoc_req->flags)) {
                 clear_bit(ASSOC_FLAG_WPA_UCAST_KEY, &assoc_req->flags);
 
-                ret = lbs_prepare_and_send_command(priv,
-                                        CMD_802_11_KEY_MATERIAL,
-                                        CMD_ACT_SET,
-                                        CMD_OPTION_WAITFORRSP,
-                                        0, assoc_req);
+                ret = lbs_set_key_material(priv, &assoc_req->wpa_mcast_key);
                 assoc_req->flags = flags;
         }
 

drivers/net/wireless/libertas/cmd.c

@@ -419 +419 @@
         lbs_deb_leave(LBS_DEB_CMD);
 }
 
-static int lbs_cmd_802_11_key_material(struct lbs_private *priv,
-                                        struct cmd_ds_command *cmd,
-                                        u16 cmd_action,
-                                        u32 cmd_oid, void *pdata_buf)
+/**
+ *  @brief Set key material
+ *
+ *  @param priv         A pointer to struct lbs_private structure
+ *  @param key          A pointer to key material
+ *
+ *  @return             0 on success, error on failure
+ */
+int lbs_set_key_material(struct lbs_private *priv, struct enc_key *key)
 {
-        struct cmd_ds_802_11_key_material *pkeymaterial =
-            &cmd->params.keymaterial;
-        struct assoc_request * assoc_req = pdata_buf;
+        struct cmd_ds_802_11_key_material cmd;
         int ret = 0;
-        int index = 0;
 
         lbs_deb_enter(LBS_DEB_CMD);
 
-        cmd->command = cpu_to_le16(CMD_802_11_KEY_MATERIAL);
-        pkeymaterial->action = cpu_to_le16(cmd_action);
-
-        if (cmd_action == CMD_ACT_GET) {
-                cmd->size = cpu_to_le16(S_DS_GEN + sizeof (pkeymaterial->action));
-                ret = 0;
-                goto done;
-        }
-
-        memset(&pkeymaterial->keyParamSet, 0, sizeof(pkeymaterial->keyParamSet));
-
-        if (test_bit(ASSOC_FLAG_WPA_UCAST_KEY, &assoc_req->flags)) {
-                set_one_wpa_key(&pkeymaterial->keyParamSet[index],
-                                &assoc_req->wpa_unicast_key);
-                index++;
-        }
-
-        if (test_bit(ASSOC_FLAG_WPA_MCAST_KEY, &assoc_req->flags)) {
-                set_one_wpa_key(&pkeymaterial->keyParamSet[index],
-                                &assoc_req->wpa_mcast_key);
-                index++;
-        }
+        memset(&cmd, 0, sizeof(cmd));
+        cmd.hdr.size = cpu_to_le16(sizeof(cmd));
+        cmd.action = cpu_to_le16(CMD_ACT_SET);
 
-        cmd->size = cpu_to_le16(  S_DS_GEN
-                                + sizeof (pkeymaterial->action)
-                                + (index * sizeof(struct MrvlIEtype_keyParamSet)));
+        memset(cmd.keyParamSet, 0, sizeof(cmd.keyParamSet));
+        set_one_wpa_key(&cmd.keyParamSet[0], key);
 
-        ret = 0;
+        ret = lbs_cmd_with_response(priv, CMD_802_11_KEY_MATERIAL, &cmd);
+        if (ret)
+                goto out;
 
-done:
+        if (key->flags & KEY_INFO_WPA_ENABLED)
+                lbs_deb_cmd("SET_WPA_KEY: %s%s installed\n",
+                        key->flags & KEY_INFO_WPA_UNICAST ?  "PTK" : "",
+                        key->flags & KEY_INFO_WPA_MCAST ? "GTK" : "");
+out:
         lbs_deb_leave_args(LBS_DEB_CMD, "ret %d", ret);
         return ret;
 }
@@ -1501 +1489 @@
                 ret = lbs_cmd_80211_ad_hoc_stop(priv, cmdptr);
                 break;
 
-        case CMD_802_11_KEY_MATERIAL:
-                ret = lbs_cmd_802_11_key_material(priv, cmdptr, cmd_action,
-                                cmd_oid, pdata_buf);
-                break;
-
         case CMD_802_11_PAIRWISE_TSC:
                 break;
+
         case CMD_802_11_GROUP_TSC:
                 break;
 

drivers/net/wireless/libertas/cmd.h

@@ -36 +36 @@
 
 int lbs_get_data_rate(struct lbs_private *priv);
 int lbs_set_data_rate(struct lbs_private *priv, u8 rate);
+int lbs_set_key_material(struct lbs_private *priv, struct enc_key *key);
 
 int lbs_get_channel(struct lbs_private *priv);
 int lbs_set_channel(struct lbs_private *priv, u8 channel);

drivers/net/wireless/libertas/hostcmd.h

@@ -599 +599 @@
 
 
 struct cmd_ds_802_11_key_material {
+        struct cmd_header hdr;
+
         __le16 action;
         struct MrvlIEtype_keyParamSet keyParamSet[2];
 } __attribute__ ((packed));

drivers/net/wireless/libertas/wext.c

@@ -30 +30 @@
         queue_delayed_work(priv->work_thread, &priv->assoc_work, HZ / 2);
 }
 
+static inline void lbs_do_association_work(struct lbs_private *priv)
+{
+        if (priv->surpriseremoved)
+                return;
+        cancel_delayed_work(&priv->assoc_work);
+        queue_delayed_work(priv->work_thread, &priv->assoc_work, 0);
+}
+
 static inline void lbs_cancel_association_work(struct lbs_private *priv)
 {
         cancel_delayed_work(&priv->assoc_work);
@@ -1608 +1616 @@
                         set_bit(ASSOC_FLAG_SECINFO, &assoc_req->flags);
                 }
 
-                disable_wep (assoc_req);
+                /* Only disable wep if necessary: can't waste time here. */
+                if (priv->mac_control & CMD_ACT_MAC_WEP_ENABLE)
+                        disable_wep(assoc_req);
         }
 
 out:
-        if (ret == 0) {
-                lbs_postpone_association_work(priv);
+        if (ret == 0) {  /* key installation is time critical: postpone not! */
+                lbs_do_association_work(priv);
         } else {
                 lbs_cancel_association_work(priv);
         }