diff options
| author | Rajeev Kumar <rajekuma@codeaurora.org> | 2016-04-15 15:01:31 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-04-20 22:20:28 -0700 |
| commit | cf835a082bb07b6a6dc616064ea7f8b157288013 (patch) | |
| tree | ead65b1cd913f8a1170e217fde537b6b1fb16306 /core/mac/src | |
| parent | be5d7fdf2747c69fff821c9ade7105b9c2ebc028 (diff) | |
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
Diffstat (limited to 'core/mac/src')
| -rw-r--r-- | core/mac/src/pe/lim/lim_process_cfg_updates.c | 4 | ||||
| -rw-r--r-- | core/mac/src/pe/lim/lim_process_deauth_frame.c | 9 | ||||
| -rw-r--r-- | core/mac/src/pe/lim/lim_process_disassoc_frame.c | 6 | ||||
| -rw-r--r-- | core/mac/src/pe/lim/lim_process_message_queue.c | 8 | ||||
| -rw-r--r-- | core/mac/src/pe/lim/lim_process_mlm_host_roam.c | 5 | ||||
| -rw-r--r-- | core/mac/src/pe/lim/lim_process_probe_req_frame.c | 6 | ||||
| -rw-r--r-- | core/mac/src/pe/lim/lim_send_management_frames.c | 3 | ||||
| -rw-r--r-- | core/mac/src/pe/lim/lim_send_sme_rsp_messages.c | 5 | ||||
| -rw-r--r-- | core/mac/src/pe/lim/lim_session.c | 4 | ||||
| -rw-r--r-- | core/mac/src/pe/lim/lim_sme_req_utils.c | 4 |
10 files changed, 14 insertions, 40 deletions
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 65bcd4bcadd0..d8f8dad24c6d 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 @@ void lim_apply_configuration(tpAniSirGlobal pMac, tpPESession psessionEntry) /* 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 ba26a694cfe3..b77a7c75e77f 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 @@ lim_process_deauth_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo, 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 @@ lim_process_deauth_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo, 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 @@ lim_process_deauth_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo, /* 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 @@ lim_process_deauth_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo, 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 699b02cf5c9c..80a06c80bac2 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 @@ lim_process_disassoc_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo, } } - 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 @@ lim_process_disassoc_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo, ) 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 b239c8529c6b..884b2050a8c4 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 @@ lim_handle80211_frames(tpAniSirGlobal pMac, tpSirMsgQ limMsg, uint8_t *pDeferMsg 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 @@ lim_handle80211_frames(tpAniSirGlobal pMac, tpSirMsgQ limMsg, uint8_t *pDeferMsg 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 @@ static void lim_process_normal_hdd_msg(tpAniSirGlobal mac_ctx, tSirMsgQ *msg, /* 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 5fcea0264fbc..9a8fa2135170 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 @@ void lim_process_mlm_reassoc_req(tpAniSirGlobal mac_ctx, uint32_t *msg) 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 @@ void lim_process_mlm_reassoc_cnf(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) 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 da973a0cf4fd..5b53e5e1edb0 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 @@ lim_process_probe_req_frame(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info, } 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_process_probe_req_frame_multiple_bss(tpAniSirGlobal mac_ctx, 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 46987e92081e..5b7193c943ac 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 @@ lim_send_auth_mgmt_frame(tpAniSirGlobal mac_ctx, 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 54eb1f07951c..50719daca663 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 @@ lim_send_sme_disassoc_ntf(tpAniSirGlobal pMac, 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 b24be5489d6c..1aa2a6080bf3 100644 --- a/core/mac/src/pe/lim/lim_session.c +++ b/core/mac/src/pe/lim/lim_session.c @@ -326,9 +326,7 @@ pe_create_session(tpAniSirGlobal pMac, uint8_t *bssid, uint8_t *sessionId, 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 fc2686306209..a4ae8933167f 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 @@ lim_is_sme_start_bss_req_valid(tpAniSirGlobal mac_ctx, 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: |
