From 52e3b4a8edc56abfd546a2e628ac3847a9392eb8 Mon Sep 17 00:00:00 2001 From: Amitkumar Karwar Date: Thu, 7 Jul 2011 17:33:19 -0700 Subject: [PATCH] --- yaml --- r: 256377 b: refs/heads/master c: e6faada5daddcdf29056c8abee0869d4e2cd55b5 h: refs/heads/master i: 256375: 1a0121870b5f76dc985b7bdb8fd216f03817d28b v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/mwifiex/cfg80211.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 13908b23fb9e..a363e0a24f98 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4fc5401c144d95b031e839ba3208e04c79ac84cb +refs/heads/master: e6faada5daddcdf29056c8abee0869d4e2cd55b5 diff --git a/trunk/drivers/net/wireless/mwifiex/cfg80211.c b/trunk/drivers/net/wireless/mwifiex/cfg80211.c index 687c1f223497..4487d935654e 100644 --- a/trunk/drivers/net/wireless/mwifiex/cfg80211.c +++ b/trunk/drivers/net/wireless/mwifiex/cfg80211.c @@ -960,7 +960,7 @@ mwifiex_cfg80211_assoc(struct mwifiex_private *priv, size_t ssid_len, u8 *ssid, ret = mwifiex_set_gen_ie(priv, sme->ie, sme->ie_len); if (sme->key) { - if (mwifiex_is_alg_wep(0) | mwifiex_is_alg_wep(0)) { + if (mwifiex_is_alg_wep(priv->sec_info.encryption_mode)) { dev_dbg(priv->adapter->dev, "info: setting wep encryption" " with key len %d\n", sme->key_len);