Commit 6a79c9f6 authored by Samuel Ortiz's avatar Samuel Ortiz Committed by John W. Linville
Browse files

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: default avatarSamuel Ortiz <sameo@linux.intel.com>
Signed-off-by: default avatarZhu Yi <yi.zhu@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent e85498b2

drivers/net/wireless/iwmc3200wifi/cfg80211.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

}