---

yaml --- r: 256377 b: refs/heads/master c: e6faada h: refs/heads/master i: 256375: 1a01218 v: v3
git-mirror · Jul 8, 2011 · 52e3b4a · 52e3b4a
1 parent 44f88a4
commit 52e3b4a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);