[WCNCR00151942] softap: Rollback 45f17e44 due to auto test fail
[Description]
Rollback commit <45f17e44ebef> due to auto test fail.
Change-Id: I62d459f8a2fcbd64fc1be2da4f136265f7cb9ebe
CR-Id: WCNCR00151942
Feature: softap
Signed-off-by: George Kuo <george.kuo@mediatek.com>
diff --git a/include/mgmt/p2p_func.h b/include/mgmt/p2p_func.h
index 53b97bd..4262bbd 100644
--- a/include/mgmt/p2p_func.h
+++ b/include/mgmt/p2p_func.h
@@ -221,8 +221,6 @@
p2pFuncInitConnectionSettings(IN P_ADAPTER_T prAdapter, IN P_P2P_CONNECTION_SETTINGS_T prP2PConnSettings, IN BOOLEAN
fgIsApMode);
-BOOLEAN p2pFuncParseCheckForTKIPInfoElem(IN PUINT_8 pucBuf);
-
BOOLEAN p2pFuncParseCheckForP2PInfoElem(IN P_ADAPTER_T prAdapter, IN PUINT_8 pucBuf, OUT PUINT_8 pucOuiType);
BOOLEAN
diff --git a/include/mgmt/p2p_role.h b/include/mgmt/p2p_role.h
index 751643a..6d288fc 100644
--- a/include/mgmt/p2p_role.h
+++ b/include/mgmt/p2p_role.h
@@ -107,7 +107,6 @@
PUINT_8 pucBcnHdr;
PUINT_8 pucBcnBody;
PUINT_8 pucAssocRespIE;
- BOOLEAN fgIsWepCipher;
UINT_8 aucBuffer[1]; /* Header & Body & Extra IEs are put here. */
} MSG_P2P_BEACON_UPDATE_T, *P_MSG_P2P_BEACON_UPDATE_T;
diff --git a/include/nic/adapter.h b/include/nic/adapter.h
index 9be8e12..777003d 100644
--- a/include/nic/adapter.h
+++ b/include/nic/adapter.h
@@ -341,7 +341,6 @@
*/
BOOLEAN fgIsNetAbsent; /* TRUE: BSS is absent, FALSE: BSS is present */
- BOOLEAN fgIsWepCipherGroup;
UINT_32 u4RsnSelectedGroupCipher;
UINT_32 u4RsnSelectedPairwiseCipher;
UINT_32 u4RsnSelectedAKMSuite;
diff --git a/mgmt/assoc.c b/mgmt/assoc.c
index 5fba19f..b73009e 100644
--- a/mgmt/assoc.c
+++ b/mgmt/assoc.c
@@ -1090,7 +1090,6 @@
UINT_16 u2BSSBasicRateSet;
UINT_8 ucFixedFieldLength;
BOOLEAN fgIsUnknownBssBasicRate;
- BOOLEAN fgIsHT = FALSE, fgIsTKIP = FALSE;
UINT_32 i;
ASSERT(prAdapter);
@@ -1183,7 +1182,6 @@
break;
case ELEM_ID_HT_CAP:
prStaRec->ucPhyTypeSet |= PHY_TYPE_BIT_HT;
- fgIsHT = TRUE;
break;
case ELEM_ID_VHT_CAP:
prStaRec->ucPhyTypeSet |= PHY_TYPE_BIT_VHT;
@@ -1201,9 +1199,6 @@
#endif
break;
case ELEM_ID_VENDOR:
- if (p2pFuncParseCheckForTKIPInfoElem(pucIE))
- fgIsTKIP = TRUE;
-
#if CFG_ENABLE_WIFI_DIRECT
{
if ((prAdapter->fgIsP2PRegistered)) {
@@ -1341,9 +1336,6 @@
}
#endif
- if (fgIsHT && fgIsTKIP && prBssInfo->eCurrentOPMode == OP_MODE_ACCESS_POINT)
- u2StatusCode = STATUS_CODE_REQ_DECLINED;
-
*pu2StatusCode = u2StatusCode;
return WLAN_STATUS_SUCCESS;
diff --git a/mgmt/p2p_func.c b/mgmt/p2p_func.c
index 26978cc..f85d6e6 100644
--- a/mgmt/p2p_func.c
+++ b/mgmt/p2p_func.c
@@ -2293,42 +2293,6 @@
/*----------------------------------------------------------------------------*/
/*!
-* @brief This function is used to check the TKIP IE
-*
-*
-* @return none
-*/
-/*----------------------------------------------------------------------------*/
-BOOLEAN p2pFuncParseCheckForTKIPInfoElem(IN PUINT_8 pucBuf)
-{
- UINT_8 aucWfaOui[] = VENDOR_OUI_WFA;
- P_WPA_INFO_ELEM_T prWpaIE = (P_WPA_INFO_ELEM_T) NULL;
- UINT_32 u4GroupKeyCipher = 0;
-
- if (pucBuf == NULL)
- return FALSE;
-
- prWpaIE = (P_WPA_INFO_ELEM_T) pucBuf;
-
- if (prWpaIE->ucLength <= ELEM_MIN_LEN_WFA_OUI_TYPE_SUBTYPE)
- return FALSE;
-
- if (prWpaIE->aucOui[0] != aucWfaOui[0] ||
- prWpaIE->aucOui[1] != aucWfaOui[1] ||
- prWpaIE->aucOui[2] != aucWfaOui[2])
- return FALSE;
-
- WLAN_GET_FIELD_32(&prWpaIE->u4GroupKeyCipherSuite, &u4GroupKeyCipher);
-
- if (prWpaIE->ucOuiType == VENDOR_OUI_TYPE_WPA &&
- u4GroupKeyCipher == WPA_CIPHER_SUITE_TKIP)
- return TRUE;
- else
- return FALSE;
-} /* p2pFuncParseCheckForP2PInfoElem */
-
-/*----------------------------------------------------------------------------*/
-/*!
* @brief This function is used to check the P2P IE
*
*
diff --git a/mgmt/p2p_role_fsm.c b/mgmt/p2p_role_fsm.c
index 5ff7e43..ff21987 100644
--- a/mgmt/p2p_role_fsm.c
+++ b/mgmt/p2p_role_fsm.c
@@ -2361,11 +2361,6 @@
prP2pBssInfo = GET_BSS_INFO_BY_INDEX(prAdapter, prRoleP2pFsmInfo->ucBssIndex);
- if (prBcnUpdateMsg->fgIsWepCipher)
- prP2pBssInfo->fgIsWepCipherGroup = TRUE;
- else
- prP2pBssInfo->fgIsWepCipherGroup = FALSE;
-
prBcnUpdateInfo = &(prRoleP2pFsmInfo->rBeaconUpdateInfo);
p2pFuncBeaconUpdate(prAdapter,
diff --git a/mgmt/rlm.c b/mgmt/rlm.c
index 790e8c6..b69d08e 100644
--- a/mgmt/rlm.c
+++ b/mgmt/rlm.c
@@ -293,8 +293,7 @@
ucPhyTypeSet = prBssInfo->ucPhyTypeSet;
}
- if (RLM_NET_IS_11N(prBssInfo) && (ucPhyTypeSet & PHY_TYPE_SET_802_11N) &&
- (!prBssInfo->fgIsWepCipherGroup))
+ if (RLM_NET_IS_11N(prBssInfo) && (ucPhyTypeSet & PHY_TYPE_SET_802_11N))
rlmFillHtCapIE(prAdapter, prBssInfo, prMsduInfo);
}
@@ -374,8 +373,7 @@
ucPhyTypeSet = prBssInfo->ucPhyTypeSet;
}
- if (RLM_NET_IS_11N(prBssInfo) && (ucPhyTypeSet & PHY_TYPE_SET_802_11N) &&
- (!prBssInfo->fgIsWepCipherGroup))
+ if (RLM_NET_IS_11N(prBssInfo) && (ucPhyTypeSet & PHY_TYPE_SET_802_11N))
rlmFillHtOpIE(prAdapter, prBssInfo, prMsduInfo);
}
diff --git a/os/linux/gl_p2p_cfg80211.c b/os/linux/gl_p2p_cfg80211.c
index bddc1cd..b02e43c 100644
--- a/os/linux/gl_p2p_cfg80211.c
+++ b/os/linux/gl_p2p_cfg80211.c
@@ -1276,12 +1276,6 @@
prP2pBcnUpdateMsg->pucBcnBody = NULL;
}
- if ((settings->crypto.cipher_group == WLAN_CIPHER_SUITE_WEP40) ||
- (settings->crypto.cipher_group == WLAN_CIPHER_SUITE_WEP104))
- prP2pBcnUpdateMsg->fgIsWepCipher = TRUE;
- else
- prP2pBcnUpdateMsg->fgIsWepCipher = FALSE;
-
if (settings->beacon.assocresp_ies_len != 0 && settings->beacon.assocresp_ies != NULL) {
prP2pBcnUpdateMsg->pucAssocRespIE = pucBuffer;
kalMemCopy(pucBuffer, settings->beacon.assocresp_ies, settings->beacon.assocresp_ies_len);
