aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwmc3200wifi/cfg80211.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/iwmc3200wifi/cfg80211.c')
-rw-r--r--drivers/net/wireless/iwmc3200wifi/cfg80211.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwmc3200wifi/cfg80211.c b/drivers/net/wireless/iwmc3200wifi/cfg80211.c
index 3f5a08fa401f..a6e852f4f92c 100644
--- a/drivers/net/wireless/iwmc3200wifi/cfg80211.c
+++ b/drivers/net/wireless/iwmc3200wifi/cfg80211.c
@@ -484,6 +484,8 @@ static int iwm_set_auth_type(struct iwm_priv *iwm,
484 484
485static int iwm_set_wpa_version(struct iwm_priv *iwm, u32 wpa_version) 485static int iwm_set_wpa_version(struct iwm_priv *iwm, u32 wpa_version)
486{ 486{
487 IWM_DBG_WEXT(iwm, DBG, "wpa_version: %d\n", wpa_version);
488
487 if (!wpa_version) { 489 if (!wpa_version) {
488 iwm->umac_profile->sec.flags = UMAC_SEC_FLG_LEGACY_PROFILE; 490 iwm->umac_profile->sec.flags = UMAC_SEC_FLG_LEGACY_PROFILE;
489 return 0; 491 return 0;
@@ -508,6 +510,9 @@ static int iwm_set_cipher(struct iwm_priv *iwm, u32 cipher, bool ucast)
508 return 0; 510 return 0;
509 } 511 }
510 512
513 IWM_DBG_WEXT(iwm, DBG, "%ccast cipher is 0x%x\n", ucast ? 'u' : 'm',
514 cipher);
515
511 switch (cipher) { 516 switch (cipher) {
512 case IW_AUTH_CIPHER_NONE: 517 case IW_AUTH_CIPHER_NONE:
513 *profile_cipher = UMAC_CIPHER_TYPE_NONE; 518 *profile_cipher = UMAC_CIPHER_TYPE_NONE;
@@ -584,11 +589,11 @@ static int iwm_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev,
584 iwm->umac_profile->bss_num = 0; 589 iwm->umac_profile->bss_num = 0;
585 } 590 }
586 591
587 ret = iwm_set_auth_type(iwm, sme->auth_type); 592 ret = iwm_set_wpa_version(iwm, sme->crypto.wpa_versions);
588 if (ret < 0) 593 if (ret < 0)
589 return ret; 594 return ret;
590 595
591 ret = iwm_set_wpa_version(iwm, sme->crypto.wpa_versions); 596 ret = iwm_set_auth_type(iwm, sme->auth_type);
592 if (ret < 0) 597 if (ret < 0)
593 return ret; 598 return ret;
594 599