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-14 16:46:15 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacld-3.0: Rename hdd_ap_ctx sapContext field

Browse source 
Per the Linux coding style "mixed-case names are frowned upon" so
rename field sapContext in struct hdd_ap_ctx.

Change-Id: Id775f77bc052a99bb443af9fa8166ec814478ddf
CRs-Fixed: 2134928
This commit is contained in:
Jeff Johnson 2017-10-27 19:23:49 -07:00
commit 0bbe66fab7
3 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

7
core/hdd/inc/wlan_hdd_main.h
View file

@ -822,6 +822,7 @@ struct hdd_station_info {
* @group_key: Group Encryption Key
* @wep_key: WEP key array
* @wep_def_key_idx: WEP default key index
* @sap_context: Pointer to context maintained by SAP (opaque to HDD)
*/
struct hdd_ap_ctx {
struct hdd_hostapd_state hostapd_state;
@ -832,6 +833,7 @@ struct hdd_ap_ctx {
tCsrRoamSetKey group_key;
tCsrRoamSetKey wep_key[CSR_MAX_NUM_KEY];
uint8_t wep_def_key_idx;
struct sap_context *sap_context;
tSirWPSPBCProbeReq WPSPBCProbeReq;
@ -847,9 +849,6 @@ struct hdd_ap_ctx {
bool bApActive;
/* SAP Context */
struct sap_context *sapContext;
bool dfs_cac_block_tx;
qdf_mc_timer_t vendor_acs_timer;
bool vendor_acs_timer_initialized;
@ -1233,7 +1232,7 @@ struct hdd_adapter {
#define WLAN_HDD_GET_HAL_CTX(adapter) ((adapter)->hdd_ctx->hHal)
#define WLAN_HDD_GET_HOSTAP_STATE_PTR(adapter) \
(&(adapter)->sessionCtx.ap.hostapd_state)
#define WLAN_HDD_GET_SAP_CTX_PTR(adapter) ((adapter)->sessionCtx.ap.sapContext)
#define WLAN_HDD_GET_SAP_CTX_PTR(adapter) ((adapter)->sessionCtx.ap.sap_context)
#ifdef WLAN_FEATURE_NAN_DATAPATH
#ifndef WLAN_FEATURE_NAN_CONVERGENCE

14
core/hdd/src/wlan_hdd_hostapd.c
View file

@ -234,7 +234,7 @@ hdd_hostapd_init_sap_session(struct hdd_adapter *adapter,
hdd_ctx = WLAN_HDD_GET_CTX(adapter);
if (reinit)
sap_ctx = adapter->sessionCtx.ap.sapContext;
sap_ctx = adapter->sessionCtx.ap.sap_context;
else
sap_ctx = wlansap_open();
@ -256,7 +256,7 @@ hdd_hostapd_init_sap_session(struct hdd_adapter *adapter,
adapter->sessionId);
if (QDF_IS_STATUS_ERROR(status)) {
hdd_err("wlansap_start failed!! status: %d", status);
adapter->sessionCtx.ap.sapContext = NULL;
adapter->sessionCtx.ap.sap_context = NULL;
/*
* In this case, we need to cleanup in the same order as create.
@ -303,7 +303,7 @@ int hdd_hostapd_deinit_sap_session(struct hdd_adapter *adapter)
hdd_err("Error closing the sap session");
status = -EINVAL;
}
adapter->sessionCtx.ap.sapContext = NULL;
adapter->sessionCtx.ap.sap_context = NULL;
if (!wlan_hdd_validate_session_id(adapter->sessionId)) {
if (hdd_objmgr_release_vdev(adapter)) {
@ -2930,7 +2930,7 @@ QDF_STATUS wlan_hdd_get_channel_for_sap_restart(
* supported, return from here if DBS is not supported.
* Need to take care of 3 port cases with 2 STA iface in future.
*/
intf_ch = wlansap_check_cc_intf(hdd_ap_ctx->sapContext);
intf_ch = wlansap_check_cc_intf(hdd_ap_ctx->sap_context);
hdd_info("intf_ch: %d", intf_ch);
if (QDF_MCC_TO_SCC_SWITCH_FORCE_PREFERRED_WITHOUT_DISCONNECTION !=
hdd_ctx->config->WlanMccToSccSwitchMode) {
@ -6257,9 +6257,9 @@ QDF_STATUS hdd_init_ap_mode(struct hdd_adapter *adapter, bool reinit)
hdd_info("SSR in progress: %d", reinit);
if (adapter->sessionCtx.ap.sapContext) {
if (adapter->sessionCtx.ap.sap_context) {
hdd_debug("sap context is not NULL, %pK",
adapter->sessionCtx.ap.sapContext);
adapter->sessionCtx.ap.sap_context);
return QDF_STATUS_SUCCESS;
}
@ -6269,7 +6269,7 @@ QDF_STATUS hdd_init_ap_mode(struct hdd_adapter *adapter, bool reinit)
return QDF_STATUS_E_FAULT;
}
if (!reinit) {
adapter->sessionCtx.ap.sapContext = sapContext;
adapter->sessionCtx.ap.sap_context = sapContext;
adapter->sessionCtx.ap.sapConfig.channel =
hdd_ctx->acs_policy.acs_channel;
acs_dfs_mode = hdd_ctx->acs_policy.acs_dfs_mode;

6
core/hdd/src/wlan_hdd_main.c
View file

@ -10805,7 +10805,7 @@ void wlan_hdd_stop_sap(struct hdd_adapter *ap_adapter)
hdd_debug("Now doing SAP STOPBSS");
qdf_event_reset(&hostapd_state->qdf_stop_bss_event);
if (QDF_STATUS_SUCCESS == wlansap_stop_bss(hdd_ap_ctx->
sapContext)) {
sap_context)) {
qdf_status = qdf_wait_single_event(&hostapd_state->
qdf_stop_bss_event,
SME_CMD_TIMEOUT_VALUE);
@ -10868,7 +10868,7 @@ void wlan_hdd_start_sap(struct hdd_adapter *ap_adapter, bool reinit)
}
qdf_event_reset(&hostapd_state->qdf_event);
if (wlansap_start_bss(hdd_ap_ctx->sapContext, hdd_hostapd_sap_event_cb,
if (wlansap_start_bss(hdd_ap_ctx->sap_context, hdd_hostapd_sap_event_cb,
&hdd_ap_ctx->sapConfig,
ap_adapter->dev)
!= QDF_STATUS_SUCCESS)
@ -12460,7 +12460,7 @@ void hdd_restart_sap(struct hdd_adapter *ap_adapter)
hdd_ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(ap_adapter);
sap_config = &hdd_ap_ctx->sapConfig;
sap_ctx = hdd_ap_ctx->sapContext;
sap_ctx = hdd_ap_ctx->sap_context;
mutex_lock(&hdd_ctx->sap_lock);
if (test_bit(SOFTAP_BSS_STARTED, &ap_adapter->event_flags)) {