A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-09 21:59:12 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacld-3.0: Remove WLAN_FEATURE_VOWIFI_11R option from WMA

Browse source 
Conditional compilation option WLAN_FEATURE_VOWIFI_11R is always
defined in cld3.0 and underlying code is permanent in the driver.
Hence, remove #ifdef WLAN_FEATURE_VOWIFI_11R check from WMA source
code.
Remove -DWLAN_FEATURE_VOWIFI_11R compilation flag from Kbuild.

CRs-Fixed: 960105
Change-Id: Idbcea2faf9aa31ef62920ef322d6de61378198a6
This commit is contained in:
Deepak Dhamdhere 2016-01-10 19:34:57 -08:00 • committed by Vishwajith Upendra
commit 4fc968d17f
6 changed files with 0 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Kbuild
View file

@ -895,7 +895,6 @@ CDEFINES := -DANI_LITTLE_BYTE_ENDIAN \
-Werror\
-D__linux__ \
-DHAL_SELF_STA_PER_BSS=1 \
-DWLAN_FEATURE_VOWIFI_11R \
-DFEATURE_WLAN_WAPI \
-DFEATURE_OEM_DATA_SUPPORT\
-DSOFTAP_CHANNEL_RANGE \

2
core/wma/inc/wma.h
View file

@ -891,9 +891,7 @@ struct wma_txrx_node {
int8_t tx_power;
int8_t max_tx_power;
uint32_t nwType;
#if defined WLAN_FEATURE_VOWIFI_11R
void *staKeyParams;
#endif
bool ps_enabled;
uint32_t dtim_policy;
uint32_t peer_count;

6
core/wma/inc/wma_if.h
View file

@ -489,10 +489,8 @@ typedef struct {
int8_t txMgmtPower;
int8_t maxTxPower;
#if defined WLAN_FEATURE_VOWIFI_11R
uint8_t extSetStaKeyParamValid;
tSetStaKeyParams extSetStaKeyParam;
#endif /* WLAN_FEATURE_VOWIFI_11R */
uint8_t ucMaxProbeRespRetryLimit;
uint8_t bHiddenSSIDEn;
@ -961,10 +959,8 @@ typedef struct sLinkStateParams {
tSirLinkState state;
tpSetLinkStateCallback callback;
void *callbackArg;
#ifdef WLAN_FEATURE_VOWIFI_11R
int ft;
void *session;
#endif /* WLAN_FEATURE_VOWIFI_11R */
bool status;
} tLinkStateParams, *tpLinkStateParams;
@ -1016,7 +1012,6 @@ typedef struct {
#endif /* WLAN_FEATURE_ROAM_OFFLOAD */
} tDelTsParams, *tpDelTsParams;
#ifdef WLAN_FEATURE_VOWIFI_11R
#define HAL_QOS_NUM_TSPEC_MAX 2
#define HAL_QOS_NUM_AC_MAX 4
@ -1037,7 +1032,6 @@ typedef struct {
uint8_t sessionId;
} tAggrAddTsParams, *tpAggrAddTsParams;
#endif /* WLAN_FEATURE_VOWIFI_11R */
typedef tSirRetStatus (*tHalMsgCallback)(tpAniSirGlobal pMac, uint32_t mesgId,
void *mesgParam);

2
core/wma/inc/wma_types.h
View file

@ -265,10 +265,8 @@
#define WMA_RUNTIME_PM_SUSPEND_IND SIR_HAL_RUNTIME_PM_SUSPEND_IND
#define WMA_RUNTIME_PM_RESUME_IND SIR_HAL_RUNTIME_PM_RESUME_IND
#ifdef WLAN_FEATURE_VOWIFI_11R
#define WMA_AGGR_QOS_REQ SIR_HAL_AGGR_QOS_REQ
#define WMA_AGGR_QOS_RSP SIR_HAL_AGGR_QOS_RSP
#endif /* WLAN_FEATURE_VOWIFI_11R */
/* FTM CMD MSG */
#define WMA_FTM_CMD_REQ SIR_PTT_MSG_TYPES_BEGIN

10
core/wma/src/wma_dev_if.c
View file

@ -432,10 +432,8 @@ void wma_vdev_detach_callback(void *ctx)
qdf_mem_free(iface->addBssStaContext);
#if defined WLAN_FEATURE_VOWIFI_11R
if (iface->staKeyParams)
qdf_mem_free(iface->staKeyParams);
#endif /* WLAN_FEATURE_VOWIFI_11R */
qdf_mem_zero(iface, sizeof(*iface));
param->status = QDF_STATUS_SUCCESS;
sme_msg.type = eWNI_SME_DEL_STA_SELF_RSP;
@ -574,10 +572,8 @@ static QDF_STATUS wma_handle_vdev_detach(tp_wma_handle wma_handle,
out:
if (iface->addBssStaContext)
qdf_mem_free(iface->addBssStaContext);
#if defined WLAN_FEATURE_VOWIFI_11R
if (iface->staKeyParams)
qdf_mem_free(iface->staKeyParams);
#endif /* WLAN_FEATURE_VOWIFI_11R */
qdf_mem_zero(iface, sizeof(*iface));
del_sta_self_req_param->status = status;
if (generate_rsp) {
@ -2414,10 +2410,8 @@ void wma_vdev_resp_timer(void *data)
}
if (iface->addBssStaContext)
qdf_mem_free(iface->addBssStaContext);
#if defined WLAN_FEATURE_VOWIFI_11R
if (iface->staKeyParams)
qdf_mem_free(iface->staKeyParams);
#endif /* WLAN_FEATURE_VOWIFI_11R */
qdf_mem_zero(iface, sizeof(*iface));
} else if (tgt_req->msg_type == WMA_ADD_BSS_REQ) {
tpAddBssParams params = (tpAddBssParams) tgt_req->user_data;
@ -2966,7 +2960,6 @@ static void wma_add_bss_sta_mode(tp_wma_handle wma, tpAddBssParams add_bss)
qdf_mem_copy(iface->addBssStaContext, &add_bss->staContext,
sizeof(tAddStaParams));
#if defined WLAN_FEATURE_VOWIFI_11R
if (iface->staKeyParams) {
qdf_mem_free(iface->staKeyParams);
iface->staKeyParams = NULL;
@ -2983,7 +2976,6 @@ static void wma_add_bss_sta_mode(tp_wma_handle wma, tpAddBssParams add_bss)
&add_bss->extSetStaKeyParam,
sizeof(tSetStaKeyParams));
}
#endif /* WLAN_FEATURE_VOWIFI_11R */
/* Save parameters later needed by WMA_ADD_STA_REQ */
iface->rmfEnabled = add_bss->rmfEnabled;
iface->beaconInterval = add_bss->beaconInterval;
@ -3743,7 +3735,6 @@ static void wma_add_sta_req_sta_mode(tp_wma_handle wma, tpAddStaParams params)
}
}
#endif /* WLAN_FEATURE_11W */
#if defined WLAN_FEATURE_VOWIFI_11R
/*
* Set the PTK in 11r mode because we already have it.
*/
@ -3751,7 +3742,6 @@ static void wma_add_sta_req_sta_mode(tp_wma_handle wma, tpAddStaParams params)
wma_set_stakey(wma,
(tpSetStaKeyParams) iface->staKeyParams);
}
#endif
}
maxTxPower = params->maxTxPower;
wma_vdev_set_bss_params(wma, params->smesessionId,

2
core/wma/src/wma_scan_roam.c
View file

@ -978,12 +978,10 @@ A_UINT32 e_csr_auth_type_to_rsn_authmode(eCsrAuthType authtype,
return WMI_AUTH_RSNA;
case eCSR_AUTH_TYPE_RSN_PSK:
return WMI_AUTH_RSNA_PSK;
#if defined WLAN_FEATURE_VOWIFI_11R
case eCSR_AUTH_TYPE_FT_RSN:
return WMI_AUTH_FT_RSNA;
case eCSR_AUTH_TYPE_FT_RSN_PSK:
return WMI_AUTH_FT_RSNA_PSK;
#endif /* WLAN_FEATURE_VOWIFI_11R */
#ifdef FEATURE_WLAN_WAPI
case eCSR_AUTH_TYPE_WAPI_WAI_CERTIFICATE:
return WMI_AUTH_WAPI;