diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-02-29 20:53:21 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-02-29 20:53:21 +0100 |
| commit | 8701ff0a88bcfc8c7dced3842919ad8d016a6835 (patch) | |
| tree | ba71774b83e92d6507a398024a6d89b146181320 /drivers/net/wireless/mwifiex/cfg80211.c | |
| parent | ath9k: decouple RX error checking for DFS (diff) | |
| parent | mwifiex: reset encryption mode flag before association (diff) | |
| download | linux-8701ff0a88bcfc8c7dced3842919ad8d016a6835.tar.xz linux-8701ff0a88bcfc8c7dced3842919ad8d016a6835.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'drivers/net/wireless/mwifiex/cfg80211.c')
| -rw-r--r-- | drivers/net/wireless/mwifiex/cfg80211.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c index 503717c59358..a460fb0cc503 100644 --- a/drivers/net/wireless/mwifiex/cfg80211.c +++ b/drivers/net/wireless/mwifiex/cfg80211.c @@ -872,6 +872,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) { |