]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
mwifiex: reset encryption mode flag before association
authorAmitkumar Karwar <akarwar@marvell.com>
Sat, 25 Feb 2012 05:35:35 +0000 (21:35 -0800)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 29 Feb 2012 18:08:52 +0000 (13:08 -0500)
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>
drivers/net/wireless/mwifiex/cfg80211.c

index 5b2972b43b0e23ee62e94d255146d6be1787634d..2210a0f9af2da52c0f761841e586f18d7ee75480 100644 (file)
@@ -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) {