qcacld-3.0: (part-3) Remove obsoleted BTAMP feature
Remove all the code written to support this feature as this feature
has been obsoleted for all next gen projects
Change-Id: Iee39090d50979e26eb833ddae4ae77c08d6d71b3
CRs-Fixed: 992930
diff --git a/core/mac/src/pe/lim/lim_process_cfg_updates.c b/core/mac/src/pe/lim/lim_process_cfg_updates.c
index 65bcd4b..d8f8dad 100644
--- a/core/mac/src/pe/lim/lim_process_cfg_updates.c
+++ b/core/mac/src/pe/lim/lim_process_cfg_updates.c
@@ -540,9 +540,7 @@
/* Added for BT - AMP Support */
if (LIM_IS_AP_ROLE(psessionEntry) ||
- LIM_IS_BT_AMP_AP_ROLE(psessionEntry) ||
- LIM_IS_IBSS_ROLE(psessionEntry) ||
- LIM_IS_BT_AMP_STA_ROLE(psessionEntry)) {
+ LIM_IS_IBSS_ROLE(psessionEntry)) {
/* This check is required to ensure the beacon generation is not done
as a part of join request for a BT-AMP station */
diff --git a/core/mac/src/pe/lim/lim_process_deauth_frame.c b/core/mac/src/pe/lim/lim_process_deauth_frame.c
index ba26a69..b77a7c7 100644
--- a/core/mac/src/pe/lim/lim_process_deauth_frame.c
+++ b/core/mac/src/pe/lim/lim_process_deauth_frame.c
@@ -190,8 +190,7 @@
return;
}
- if (LIM_IS_AP_ROLE(psessionEntry) ||
- LIM_IS_BT_AMP_AP_ROLE(psessionEntry)) {
+ if (LIM_IS_AP_ROLE(psessionEntry)) {
switch (reasonCode) {
case eSIR_MAC_UNSPEC_FAILURE_REASON:
case eSIR_MAC_DEAUTH_LEAVING_BSS_REASON:
@@ -210,8 +209,7 @@
break;
}
- } else if (LIM_IS_STA_ROLE(psessionEntry) ||
- LIM_IS_BT_AMP_STA_ROLE(psessionEntry)) {
+ } else if (LIM_IS_STA_ROLE(psessionEntry)) {
switch (reasonCode) {
case eSIR_MAC_UNSPEC_FAILURE_REASON:
case eSIR_MAC_PREV_AUTH_NOT_VALID_REASON:
@@ -342,7 +340,6 @@
/* Check for pre-assoc states */
switch (GET_LIM_SYSTEM_ROLE(psessionEntry)) {
case eLIM_STA_ROLE:
- case eLIM_BT_AMP_STA_ROLE:
switch (psessionEntry->limMlmState) {
case eLIM_MLM_WT_AUTH_FRAME2_STATE:
/**
@@ -516,7 +513,7 @@
case eLIM_AP_ROLE:
break;
- default: /* eLIM_AP_ROLE or eLIM_BT_AMP_AP_ROLE */
+ default:
return;
} /* end switch (pMac->lim.gLimSystemRole) */
diff --git a/core/mac/src/pe/lim/lim_process_disassoc_frame.c b/core/mac/src/pe/lim/lim_process_disassoc_frame.c
index 699b02c..80a06c8 100644
--- a/core/mac/src/pe/lim/lim_process_disassoc_frame.c
+++ b/core/mac/src/pe/lim/lim_process_disassoc_frame.c
@@ -237,8 +237,7 @@
}
}
- if (LIM_IS_AP_ROLE(psessionEntry) ||
- LIM_IS_BT_AMP_AP_ROLE(psessionEntry)) {
+ if (LIM_IS_AP_ROLE(psessionEntry)) {
switch (reasonCode) {
case eSIR_MAC_UNSPEC_FAILURE_REASON:
case eSIR_MAC_DISASSOC_DUE_TO_INACTIVITY_REASON:
@@ -261,8 +260,7 @@
)
break;
}
- } else if ((LIM_IS_STA_ROLE(psessionEntry) ||
- LIM_IS_BT_AMP_STA_ROLE(psessionEntry)) &&
+ } else if (LIM_IS_STA_ROLE(psessionEntry) &&
((psessionEntry->limSmeState != eLIM_SME_WT_JOIN_STATE) &&
(psessionEntry->limSmeState != eLIM_SME_WT_AUTH_STATE) &&
(psessionEntry->limSmeState != eLIM_SME_WT_ASSOC_STATE) &&
diff --git a/core/mac/src/pe/lim/lim_process_message_queue.c b/core/mac/src/pe/lim/lim_process_message_queue.c
index b239c85..884b205 100644
--- a/core/mac/src/pe/lim/lim_process_message_queue.c
+++ b/core/mac/src/pe/lim/lim_process_message_queue.c
@@ -930,8 +930,7 @@
switch (fc.subType) {
case SIR_MAC_MGMT_ASSOC_REQ:
/* Make sure the role supports Association */
- if (LIM_IS_BT_AMP_AP_ROLE(psessionEntry) ||
- LIM_IS_AP_ROLE(psessionEntry))
+ if (LIM_IS_AP_ROLE(psessionEntry))
lim_process_assoc_req_frame(pMac,
pRxPacketInfo,
LIM_ASSOC,
@@ -955,8 +954,7 @@
case SIR_MAC_MGMT_REASSOC_REQ:
/* Make sure the role supports Reassociation */
- if (LIM_IS_BT_AMP_AP_ROLE(psessionEntry) ||
- LIM_IS_AP_ROLE(psessionEntry)) {
+ if (LIM_IS_AP_ROLE(psessionEntry)) {
lim_process_assoc_req_frame(pMac,
pRxPacketInfo,
LIM_REASSOC,
@@ -2145,8 +2143,6 @@
/* Added For BT-AMP Support */
if ((mac_ctx->lim.gLimSystemRole == eLIM_AP_ROLE)
- || (mac_ctx->lim.gLimSystemRole == eLIM_BT_AMP_AP_ROLE)
- || (mac_ctx->lim.gLimSystemRole == eLIM_BT_AMP_STA_ROLE)
|| (mac_ctx->lim.gLimSystemRole == eLIM_UNKNOWN_ROLE)) {
/*
* This check is required only for the AP and in 2 cases.
diff --git a/core/mac/src/pe/lim/lim_process_mlm_host_roam.c b/core/mac/src/pe/lim/lim_process_mlm_host_roam.c
index 5fcea02..9a8fa21 100644
--- a/core/mac/src/pe/lim/lim_process_mlm_host_roam.c
+++ b/core/mac/src/pe/lim/lim_process_mlm_host_roam.c
@@ -87,8 +87,7 @@
reassoc_req->sessionId, GET_LIM_SYSTEM_ROLE(session),
session->limMlmState, MAC_ADDR_ARRAY(reassoc_req->peerMacAddr));
- if ((LIM_IS_AP_ROLE(session) ||
- LIM_IS_BT_AMP_AP_ROLE(session)) ||
+ if (LIM_IS_AP_ROLE(session) ||
(session->limMlmState !=
eLIM_MLM_LINK_ESTABLISHED_STATE)) {
/*
@@ -262,7 +261,7 @@
return;
}
if ((session->limSmeState != eLIM_SME_WT_REASSOC_STATE) ||
- LIM_IS_AP_ROLE(session) || LIM_IS_BT_AMP_AP_ROLE(session)) {
+ LIM_IS_AP_ROLE(session)) {
/*
* Should not have received Reassocication confirm
* from MLM in other states OR on AP.
diff --git a/core/mac/src/pe/lim/lim_process_probe_req_frame.c b/core/mac/src/pe/lim/lim_process_probe_req_frame.c
index da973a0..5b53e5e 100644
--- a/core/mac/src/pe/lim/lim_process_probe_req_frame.c
+++ b/core/mac/src/pe/lim/lim_process_probe_req_frame.c
@@ -373,8 +373,6 @@
}
mac_hdr = WMA_GET_RX_MAC_HEADER(rx_pkt_info);
if (LIM_IS_AP_ROLE(session) ||
- LIM_IS_BT_AMP_AP_ROLE(session) ||
- LIM_IS_BT_AMP_STA_ROLE(session) ||
(LIM_IS_IBSS_ROLE(session) &&
(WMA_GET_RX_BEACON_SENT(rx_pkt_info)))) {
frame_len = WMA_GET_RX_PAYLOAD_LEN(rx_pkt_info);
@@ -606,9 +604,7 @@
lim_indicate_probe_req_to_hdd(mac_ctx,
buf_descr, session);
if (LIM_IS_AP_ROLE(session) ||
- LIM_IS_IBSS_ROLE(session) ||
- LIM_IS_BT_AMP_AP_ROLE(session) ||
- LIM_IS_BT_AMP_STA_ROLE(session))
+ LIM_IS_IBSS_ROLE(session))
lim_process_probe_req_frame(mac_ctx,
buf_descr, session);
}
diff --git a/core/mac/src/pe/lim/lim_send_management_frames.c b/core/mac/src/pe/lim/lim_send_management_frames.c
index 46987e9..5b7193c 100644
--- a/core/mac/src/pe/lim/lim_send_management_frames.c
+++ b/core/mac/src/pe/lim/lim_send_management_frames.c
@@ -2148,8 +2148,7 @@
mac_hdr->fc.wep = wep_bit;
/* Prepare BSSId */
- if (LIM_IS_AP_ROLE(session) ||
- LIM_IS_BT_AMP_AP_ROLE(session))
+ if (LIM_IS_AP_ROLE(session))
qdf_mem_copy((uint8_t *) mac_hdr->bssId,
(uint8_t *) session->bssId,
sizeof(tSirMacAddr));
diff --git a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c
index 54eb1f0..50719da 100644
--- a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c
+++ b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c
@@ -1023,11 +1023,8 @@
error:
/* Delete the PE session Created */
- if ((psessionEntry != NULL) &&
- (LIM_IS_STA_ROLE(psessionEntry) ||
- LIM_IS_BT_AMP_STA_ROLE(psessionEntry))) {
+ if ((psessionEntry != NULL) && LIM_IS_STA_ROLE(psessionEntry))
pe_delete_session(pMac, psessionEntry);
- }
if (false == failure)
lim_send_sme_disassoc_deauth_ntf(pMac, QDF_STATUS_SUCCESS,
diff --git a/core/mac/src/pe/lim/lim_session.c b/core/mac/src/pe/lim/lim_session.c
index b24be54..1aa2a60 100644
--- a/core/mac/src/pe/lim/lim_session.c
+++ b/core/mac/src/pe/lim/lim_session.c
@@ -326,9 +326,7 @@
FL("Create a new PE session(%d), BSSID: "MAC_ADDRESS_STR" Max No. of STA %d"),
session_ptr->peSessionId, MAC_ADDR_ARRAY(bssid), numSta);
- if (eSIR_INFRA_AP_MODE == bssType
- || eSIR_IBSS_MODE == bssType
- || eSIR_BTAMP_AP_MODE == bssType) {
+ if (eSIR_INFRA_AP_MODE == bssType || eSIR_IBSS_MODE == bssType) {
session_ptr->pSchProbeRspTemplate =
qdf_mem_malloc(SCH_MAX_PROBE_RESP_SIZE);
session_ptr->pSchBeaconFrameBegin =
diff --git a/core/mac/src/pe/lim/lim_sme_req_utils.c b/core/mac/src/pe/lim/lim_sme_req_utils.c
index fc26863..a4ae893 100644
--- a/core/mac/src/pe/lim/lim_sme_req_utils.c
+++ b/core/mac/src/pe/lim/lim_sme_req_utils.c
@@ -407,10 +407,6 @@
break;
case eSIR_IBSS_MODE:
break;
- case eSIR_BTAMP_STA_MODE:
- break;
- case eSIR_BTAMP_AP_MODE:
- break;
case eSIR_INFRA_AP_MODE:
break;
default: