From 0fc37bc95756325952e66e45fbdec625ef57ff05 Mon Sep 17 00:00:00 2001
From: Larry Finger <Larry.Finger@lwfinger.net>
Date: Mon, 30 Aug 2010 22:32:34 -0500
Subject: [PATCH] --- yaml --- r: 219617 b: refs/heads/master c:
 1c9bb32a384d629339fbb56bcf7e4afa55141419 h: refs/heads/master i:   219615:
 f0935e0b4e2a3997cf76d1b567e8fe2bc3829249 v: v3

---
 [refs]                                      |  2 +-
 trunk/drivers/staging/rtl8712/rtl871x_cmd.c | 30 +++++++++++++--------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 939e328aa6e7..3fcd7e7bc748 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 16e53729b799dce572557022952d63cc19f47a7b
+refs/heads/master: 1c9bb32a384d629339fbb56bcf7e4afa55141419
diff --git a/trunk/drivers/staging/rtl8712/rtl871x_cmd.c b/trunk/drivers/staging/rtl8712/rtl871x_cmd.c
index 38c7dc683c76..fbb2e4eaae51 100644
--- a/trunk/drivers/staging/rtl8712/rtl871x_cmd.c
+++ b/trunk/drivers/staging/rtl8712/rtl871x_cmd.c
@@ -474,17 +474,25 @@ u8 r8712_joinbss_cmd(struct _adapter  *padapter, struct wlan_network *pnetwork)
 			pqospriv->qos_option = 0; /* no WMM IE in beacon */
 	}
 	if (pregistrypriv->ht_enable) {
-		/* r8712_restructure_ht_ie */
-		r8712_restructure_ht_ie(padapter, &pnetwork->network.IEs[0],
-				  &psecnetwork->IEs[0],
-				  pnetwork->network.IELength,
-				  &psecnetwork->IELength);
-		if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == true)
-			r8712_add_ht_addt_info(padapter,
-					 &pnetwork->network.IEs[0],
-					 &psecnetwork->IEs[0],
-					 pnetwork->network.IELength,
-					 &psecnetwork->IELength);
+		/* For WEP mode, we will use the bg mode to do the connection
+		 * to avoid some IOT issues, especially for Realtek 8192u
+		 * SoftAP.
+		 */
+		if ((padapter->securitypriv.PrivacyAlgrthm != _WEP40_ ) &&
+		    (padapter->securitypriv.PrivacyAlgrthm != _WEP104_ )) {
+			/* restructure_ht_ie */
+			r8712_restructure_ht_ie(padapter,
+						&pnetwork->network.IEs[0],
+						&psecnetwork->IEs[0],
+						pnetwork->network.IELength,
+						&psecnetwork->IELength);
+			if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE))
+				r8712_add_ht_addt_info(padapter,
+						&pnetwork->network.IEs[0],
+						&psecnetwork->IEs[0],
+						pnetwork->network.IELength,
+						&psecnetwork->IELength);
+		}
 	}
 	psecuritypriv->supplicant_ie[0] = (u8)psecnetwork->IELength;
 	if (psecnetwork->IELength < 255)