iwmc3200wifi: Set WEP key from connect

When connect is called with the LEGACY_PSK authentication type set, and a
proper sme->key, we need to set the WEP key straight after setting the
profile otherwise the authentication will never start.

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 43 insertions, 1 deletions

diff --git a/drivers/net/wireless/iwmc3200wifi/cfg80211.c b/drivers/net/wireless/iwmc3200wifi/cfg80211.c
index 789ef5ca88b..d8bb723d88d 100644
--- a/drivers/net/wireless/iwmc3200wifi/cfg80211.c
+++ b/drivers/net/wireless/iwmc3200wifi/cfg80211.c
@@ -562,6 +562,7 @@ static int iwm_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev,
 {
         struct iwm_priv *iwm = wiphy_to_iwm(wiphy);
         struct ieee80211_channel *chan = sme->channel;
+        struct key_params key_param;
         int ret;
 
         if (!test_bit(IWM_STATUS_READY, &iwm->status))
@@ -619,7 +620,48 @@ static int iwm_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev,
                         return ret;
         }
 
-        return iwm_send_mlme_profile(iwm);
+        /*
+         * We save the WEP key in case we want to do shared authentication.
+         * We have to do it so because UMAC will assert whenever it gets a
+         * key before a profile.
+         */
+        if (sme->key) {
+                key_param.key = kmemdup(sme->key, sme->key_len, GFP_KERNEL);
+                if (key_param.key == NULL)
+                        return -ENOMEM;
+                key_param.key_len = sme->key_len;
+                key_param.seq_len = 0;
+                key_param.cipher = sme->crypto.ciphers_pairwise[0];
+
+                ret = iwm_key_init(&iwm->keys[sme->key_idx], sme->key_idx,
+                                   NULL, &key_param);
+                kfree(key_param.key);
+                if (ret < 0) {
+                        IWM_ERR(iwm, "Invalid key_params\n");
+                        return ret;
+                }
+
+                iwm->default_key = sme->key_idx;
+        }
+
+        ret = iwm_send_mlme_profile(iwm);
+
+        if (iwm->umac_profile->sec.auth_type != UMAC_AUTH_TYPE_LEGACY_PSK ||
+            sme->key == NULL)
+                return ret;
+
+        /*
+         * We want to do shared auth.
+         * We need to actually set the key we previously cached,
+         * and then tell the UMAC it's the default one.
+         * That will trigger the auth+assoc UMAC machinery, and again,
+         * this must be done after setting the profile.
+         */
+        ret = iwm_set_key(iwm, 0, &iwm->keys[sme->key_idx]);
+        if (ret < 0)
+                return ret;
+
+        return iwm_set_tx_key(iwm, iwm->default_key);
 }
 
 static int iwm_cfg80211_disconnect(struct wiphy *wiphy, struct net_device *dev,