summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmitkumar Karwar <akarwar@marvell.com>2012-02-24 21:35:35 -0800
committerJohn W. Linville <linville@tuxdriver.com>2012-02-29 13:08:52 -0500
commit00f157b49780e194c38dafdf9df8e10b8a6a9626 (patch)
treef477aafdc4d49efbadec217d31d192f567ac5923
parent9926a67557532acb6cddb1c1add02952175b5c72 (diff)
downloadlinux-00f157b49780e194c38dafdf9df8e10b8a6a9626.tar.gz
linux-00f157b49780e194c38dafdf9df8e10b8a6a9626.tar.bz2
linux-00f157b49780e194c38dafdf9df8e10b8a6a9626.zip
mwifiex: reset encryption mode flag before association
Recent commit "mwifiex: clear previous security setting during association" fixes association failure problems observed in some corner cases by clearing previous security setting before each association. We should reset encryption mode flag as well. This patch takes care of it. Signed-off-by: Amitkumar Karwar <akarwar@marvell.com> Signed-off-by: Bing Zhao <bzhao@marvell.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/mwifiex/cfg80211.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c
index 5b2972b43b0e..2210a0f9af2d 100644
--- a/drivers/net/wireless/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/mwifiex/cfg80211.c
@@ -846,6 +846,7 @@ mwifiex_cfg80211_assoc(struct mwifiex_private *priv, size_t ssid_len, u8 *ssid,
priv->sec_info.wpa_enabled = false;
priv->sec_info.wpa2_enabled = false;
priv->wep_key_curr_index = 0;
+ priv->sec_info.encryption_mode = 0;
ret = mwifiex_set_encode(priv, NULL, 0, 0, 1);
if (mode == NL80211_IFTYPE_ADHOC) {