From 8fb016b6694c1ac7cf7b1ae731f616c6b27992a1 Mon Sep 17 00:00:00 2001 From: Samuel Ortiz Date: Fri, 16 Oct 2009 13:18:49 +0800 Subject: [PATCH] --- yaml --- r: 171006 b: refs/heads/master c: 6a79c9f62a87e39a265f9b855911fbc1f094ded0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwmc3200wifi/cfg80211.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index e9669baaca79..7eb6fd6c3ac0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e85498b21d0372a00f31ab9f7c0d215c32c9fad5 +refs/heads/master: 6a79c9f62a87e39a265f9b855911fbc1f094ded0 diff --git a/trunk/drivers/net/wireless/iwmc3200wifi/cfg80211.c b/trunk/drivers/net/wireless/iwmc3200wifi/cfg80211.c index ca75d07831a9..89edb6629426 100644 --- a/trunk/drivers/net/wireless/iwmc3200wifi/cfg80211.c +++ b/trunk/drivers/net/wireless/iwmc3200wifi/cfg80211.c @@ -471,12 +471,12 @@ static int iwm_set_wpa_version(struct iwm_priv *iwm, u32 wpa_version) return 0; } + if (wpa_version & NL80211_WPA_VERSION_1) + iwm->umac_profile->sec.flags = UMAC_SEC_FLG_WPA_ON_MSK; + if (wpa_version & NL80211_WPA_VERSION_2) iwm->umac_profile->sec.flags = UMAC_SEC_FLG_RSNA_ON_MSK; - if (wpa_version & NL80211_WPA_VERSION_1) - iwm->umac_profile->sec.flags |= UMAC_SEC_FLG_WPA_ON_MSK; - return 0; }