Revert "qcacld-3.0: Fix MU EDCA iot AP issue"

This reverts commit I0ad26214417d33bafcbb6939a247bebe4f4637f8.

Change-Id: I5fd3f449557e7db1c6abfdcc6db199636d25884a
CRs-Fixed: 3283064

components/action_oui/core/src/wlan_action_oui_parse.c

@@ -790,9 +790,6 @@ check_for_vendor_ap_mac(struct action_oui_extension *extension,
 	uint8_t mac_mask = 0x80;
 	uint8_t *mac_addr = attr->mac_addr;
 
-	if (!attr->mac_addr)
-		return false;
-
 	for (i = 0; i < QDF_MAC_ADDR_SIZE; i++) {
 		if ((*extension->mac_mask & mac_mask) &&
 		    !(extension->mac_addr[i] == mac_addr[i]))

components/action_oui/dispatcher/inc/wlan_action_oui_public_struct.h

@@ -92,7 +92,6 @@
  * @ACTION_OUI_FORCE_MAX_NSS: Force Max NSS connection with few IOT APs
  * @ACTION_OUI_DISABLE_AGGRESSIVE_EDCA: disable aggressive EDCA with the ap
  * @ACTION_OUI_DISABLE_TWT: disable TWT with the ap
- * @ACTION_OUI_DISABLE_MU_EDCA: host don't config MU EDCA with the ap
  * @ACTION_OUI_EXTEND_WOW_ITO: extend ITO under WOW mode if vendor OUI is
  * received in beacon.
  * @ACTION_OUI_HOST_ONLY: host only action id start - placeholder.
@@ -113,8 +112,7 @@ enum action_oui_id {
 	ACTION_OUI_FORCE_MAX_NSS = 7,
 	ACTION_OUI_DISABLE_AGGRESSIVE_EDCA = 8,
 	ACTION_OUI_DISABLE_TWT = 9,
-	ACTION_OUI_DISABLE_MU_EDCA = 10,
-	ACTION_OUI_EXTEND_WOW_ITO = 11,
+	ACTION_OUI_EXTEND_WOW_ITO = 10,
 	ACTION_OUI_HOST_ONLY,
 	ACTION_OUI_HOST_RECONN = ACTION_OUI_HOST_ONLY,
 	ACTION_OUI_TAKE_ALL_BAND_INFO,

core/hdd/inc/hdd_config.h

@@ -1364,42 +1364,6 @@ struct dhcp_server {
 	"", \
 	"Used to specify action OUIs to control edca configuration")
 
-/*
- * <ini>
- * gActionOUIDisableMuEDCA - Used to specify action OUIs to control
- * MU EDCA configuration when join the candidate AP
- *
- * Note: User should strictly add new action OUIs at the end of this
- * default value.
- *
- * One special AP sets MU EDCA timer as 255 wrongly in both beacon and assoc
- * rsp, lead to 2 sec SU UL data stall periodically.
- * This ini is used to specify AP OUIs. Don't follow mu edca in assoc rsp
- * when connecting to those AP, just reset mu edca timer to 1.
- * For default:
- *     gActionOUIDisableMuEDCA=000CE7 08 00000000BF0CB101 FF 01
- *          Explain: 000CE7: OUI
- *                   08: data length
- *                   00000000BF0CB101: data
- *                   FF: OUI data mask: 11111111
- *                   01: info mask, only OUI present in info mask
- * Refer to gEnableActionOUI for more detail about the format.
- *
- * Related: gEnableActionOUI
- *
- * Supported Feature: Action OUIs
- *
- * Usage: External
- *
- * </ini>
- */
-#define CFG_ACTION_OUI_DISABLE_MU_EDCA CFG_INI_STRING( \
-	"gActionOUIDisableMuEDCA", \
-	0, \
-	ACTION_OUI_MAX_STR_LEN, \
-	"000CE7 08 00000000BF0CB101 FF 01", \
-	"Used to specify action OUIs to control mu edca configuration")
-
 /*
  * <ini>
  * gActionOUIExtendWowITO - Used to extend ITO(Inactivity Time-Out) value under
@@ -1969,7 +1933,6 @@ enum host_log_level {
 	CFG(CFG_ACTION_OUI_DISABLE_AGGRESSIVE_TX) \
 	CFG(CFG_ACTION_OUI_FORCE_MAX_NSS) \
 	CFG(CFG_ACTION_OUI_DISABLE_AGGRESSIVE_EDCA) \
-	CFG(CFG_ACTION_OUI_DISABLE_MU_EDCA) \
 	CFG(CFG_ACTION_OUI_EXTEND_WOW_ITO) \
 	CFG(CFG_ACTION_OUI_SWITCH_TO_11N_MODE) \
 	CFG(CFG_ACTION_OUI_RECONN_ASSOCTIMEOUT) \

core/hdd/src/wlan_hdd_main.c

@@ -12540,10 +12540,6 @@ static void hdd_cfg_params_init(struct hdd_context *hdd_ctx)
 		      cfg_get(psoc,
 			      CFG_ACTION_OUI_DISABLE_AGGRESSIVE_EDCA),
 		      ACTION_OUI_MAX_STR_LEN);
-	qdf_str_lcopy(config->action_oui_str[ACTION_OUI_DISABLE_MU_EDCA],
-		      cfg_get(psoc,
-			      CFG_ACTION_OUI_DISABLE_MU_EDCA),
-		      ACTION_OUI_MAX_STR_LEN);
 	qdf_str_lcopy(config->action_oui_str[ACTION_OUI_EXTEND_WOW_ITO],
 		      cfg_get(psoc, CFG_ACTION_OUI_EXTEND_WOW_ITO),
 		      ACTION_OUI_MAX_STR_LEN);

core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c

@@ -49,7 +49,6 @@
 #include <lim_mlo.h>
 #include "parser_api.h"
 #include "wlan_twt_cfg_ext_api.h"
-#include "wlan_action_oui_main.h"
 
 /**
  * lim_update_stads_htcap() - Updates station Descriptor HT capability
@@ -948,8 +947,6 @@ lim_process_assoc_rsp_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_info,
 	enum ani_akm_type auth_type;
 	bool sha384_akm, twt_support_in_11n = false;
 	struct s_ext_cap *ext_cap;
-	bool bad_ap;
-	struct action_oui_search_attr attr = {0};
 
 	assoc_cnf.resultCode = eSIR_SME_SUCCESS;
 	/* Update PE session Id */
@@ -1451,25 +1448,8 @@ lim_process_assoc_rsp_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_info,
 	lim_update_assoc_sta_datas(mac_ctx, sta_ds, assoc_rsp,
 				   session_entry, beacon);
 
-	/*
-	 * One special AP sets MU EDCA timer as 255 wrongly in both beacon and
-	 * assoc rsp, lead to 2 sec SU upload data stall periodically.
-	 * To fix it, reset MU EDCA timer to 1 and config to F/W for such AP.
-	 */
 	if (lim_is_session_he_capable(session_entry)) {
-		attr.ie_data = ie;
-		attr.ie_length = ie_len;
-		bad_ap = wlan_action_oui_search(mac_ctx->psoc,
-						&attr,
-						ACTION_OUI_DISABLE_MU_EDCA);
 		session_entry->mu_edca_present = assoc_rsp->mu_edca_present;
-		if (session_entry->mu_edca_present && bad_ap) {
-			pe_debug("IoT AP with bad mu edca timer, reset to 1");
-			assoc_rsp->mu_edca.acbe.mu_edca_timer = 1;
-			assoc_rsp->mu_edca.acbk.mu_edca_timer = 1;
-			assoc_rsp->mu_edca.acvi.mu_edca_timer = 1;
-			assoc_rsp->mu_edca.acvo.mu_edca_timer = 1;
-		}
 		if (session_entry->mu_edca_present) {
 			pe_debug("Save MU EDCA params to session");
 			session_entry->ap_mu_edca_params[QCA_WLAN_AC_BE] =