diff options
| author |   Samuel Ortiz <sameo@linux.intel.com> | 2009-10-16 13:18:49 +0800 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2009-10-27 16:48:25 -0400 |
| commit | 6a79c9f62a87e39a265f9b855911fbc1f094ded0 (patch) | |
| tree | c8cdfa2d6e199dcefbfccf792c17550d7508a0ce /drivers/net/wireless/iwmc3200wifi/cfg80211.c | |
| parent | iwmc3200wifi: CT kill support (diff) | |
| download | linux-dev-6a79c9f62a87e39a265f9b855911fbc1f094ded0.tar.xz linux-dev-6a79c9f62a87e39a265f9b855911fbc1f094ded0.zip | |
iwmc3200wifi: Profile flags can be WPA1 or WPA2 not both
UMAC will ASSERT if the profile security flag is WPA1 | WPA2, so we can only
accept one of those.
Moreover wpa_s wext and nl80211 drivers dont try to send WPA1 | WPA2, but only
one at a time.
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwmc3200wifi/cfg80211.c')
| -rw-r--r-- | drivers/net/wireless/iwmc3200wifi/cfg80211.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwmc3200wifi/cfg80211.c b/drivers/net/wireless/iwmc3200wifi/cfg80211.c index ca75d07831a9..89edb6629426 100644 --- a/drivers/net/wireless/iwmc3200wifi/cfg80211.c +++ b/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; } |