qcacld-3.0: cleanup cds_concurrency files
Code cleanup & update of correct copyright information. Change-Id: Icee77761cf00cee3b633bd260d5af38286a4f22c CRs-fixed: 956394
This commit is contained in:

committed by
Akash Patel

parent
e839f8f3fb
commit
4adb368b6a
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2015-2016 The Linux Foundation. All rights reserved.
|
||||
* Copyright (c) 2012-2016 The Linux Foundation. All rights reserved.
|
||||
*
|
||||
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
|
||||
*
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2015-2016 The Linux Foundation. All rights reserved.
|
||||
* Copyright (c) 2012-2016 The Linux Foundation. All rights reserved.
|
||||
*
|
||||
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
|
||||
*
|
||||
@@ -2329,8 +2329,7 @@ void cds_set_dual_mac_scan_config(uint8_t dbs_val,
|
||||
*
|
||||
* Return: None
|
||||
*/
|
||||
void cds_set_dual_mac_fw_mode_config(uint8_t dbs,
|
||||
uint8_t dfs)
|
||||
void cds_set_dual_mac_fw_mode_config(uint8_t dbs, uint8_t dfs)
|
||||
{
|
||||
struct sir_dual_mac_config cfg;
|
||||
CDF_STATUS status;
|
||||
@@ -3646,8 +3645,7 @@ static void cds_set_pcl_for_existing_combo(enum cds_con_mode mode)
|
||||
return;
|
||||
};
|
||||
|
||||
if (cds_mode_specific_connection_count(
|
||||
mode, NULL) > 0) {
|
||||
if (cds_mode_specific_connection_count(mode, NULL) > 0) {
|
||||
/* Check, store and temp delete the mode's parameter */
|
||||
cds_store_and_del_conn_info(mode, &info);
|
||||
/* Set the PCL to the FW since connection got updated */
|
||||
@@ -4910,8 +4908,7 @@ bool cds_allow_concurrency(enum cds_con_mode mode,
|
||||
goto done;
|
||||
}
|
||||
}
|
||||
count = cds_mode_specific_connection_count(
|
||||
CDS_STA_MODE, list);
|
||||
count = cds_mode_specific_connection_count(CDS_STA_MODE, list);
|
||||
if ((CDS_STA_MODE == mode) &&
|
||||
(cds_mode_specific_connection_count(
|
||||
CDS_IBSS_MODE, list)) && count) {
|
||||
@@ -4921,8 +4918,7 @@ bool cds_allow_concurrency(enum cds_con_mode mode,
|
||||
}
|
||||
|
||||
if ((CDS_STA_MODE == mode) &&
|
||||
(cds_mode_specific_connection_count(
|
||||
CDS_IBSS_MODE, list))) {
|
||||
(cds_mode_specific_connection_count(CDS_IBSS_MODE, list))) {
|
||||
if (wma_is_hw_dbs_capable() == true) {
|
||||
if (num_connections > 1) {
|
||||
/* err msg */
|
||||
|
@@ -1415,9 +1415,7 @@ static void hdd_send_re_assoc_event(struct net_device *dev,
|
||||
* active session count should still be the same and hence upon
|
||||
* successful reassoc decrement the active session count here.
|
||||
*/
|
||||
cds_decr_session_set_pcl(
|
||||
pAdapter->device_mode,
|
||||
pAdapter->sessionId);
|
||||
cds_decr_session_set_pcl(pAdapter->device_mode, pAdapter->sessionId);
|
||||
|
||||
/* Send the Assoc Resp, the supplicant needs this for initial Auth */
|
||||
len = pCsrRoamInfo->nAssocRspLength - FT_ASSOC_RSP_IES_OFFSET;
|
||||
@@ -1847,8 +1845,7 @@ defined(FEATURE_WLAN_LFR)
|
||||
wlan_hdd_auto_shutdown_enable(pHddCtx, false);
|
||||
#endif
|
||||
|
||||
cds_check_concurrent_intf_and_restart_sap(
|
||||
pHddStaCtx,
|
||||
cds_check_concurrent_intf_and_restart_sap(pHddStaCtx,
|
||||
pAdapter);
|
||||
|
||||
#ifdef FEATURE_WLAN_TDLS
|
||||
|
@@ -8006,8 +8006,7 @@ int wlan_hdd_cfg80211_connect_start(hdd_adapter_t *pAdapter,
|
||||
* check for other concurrency rules.
|
||||
*/
|
||||
if (!pHddCtx->config->policy_manager_enabled) {
|
||||
cds_handle_conc_rule1(pAdapter,
|
||||
pRoamProfile);
|
||||
cds_handle_conc_rule1(pAdapter, pRoamProfile);
|
||||
if (true != cds_handle_conc_rule2(
|
||||
pAdapter, pRoamProfile, &roamId))
|
||||
return 0;
|
||||
|
@@ -556,8 +556,7 @@ static int hdd_stop_bss_link(hdd_adapter_t *pHostapdAdapter,
|
||||
hddLog(LOGE, FL("Deleting SAP/P2P link!!!!!!"));
|
||||
|
||||
clear_bit(SOFTAP_BSS_STARTED, &pHostapdAdapter->event_flags);
|
||||
cds_decr_session_set_pcl(
|
||||
pHostapdAdapter->device_mode,
|
||||
cds_decr_session_set_pcl(pHostapdAdapter->device_mode,
|
||||
pHostapdAdapter->sessionId);
|
||||
}
|
||||
EXIT();
|
||||
@@ -4965,8 +4964,7 @@ __iw_softap_stopbss(struct net_device *dev,
|
||||
}
|
||||
}
|
||||
clear_bit(SOFTAP_BSS_STARTED, &pHostapdAdapter->event_flags);
|
||||
cds_decr_session_set_pcl(
|
||||
pHostapdAdapter->device_mode,
|
||||
cds_decr_session_set_pcl(pHostapdAdapter->device_mode,
|
||||
pHostapdAdapter->sessionId);
|
||||
}
|
||||
EXIT();
|
||||
@@ -7872,8 +7870,7 @@ static int __wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy,
|
||||
}
|
||||
clear_bit(SOFTAP_BSS_STARTED, &pAdapter->event_flags);
|
||||
/*BSS stopped, clear the active sessions for this device mode*/
|
||||
cds_decr_session_set_pcl(
|
||||
pAdapter->device_mode,
|
||||
cds_decr_session_set_pcl(pAdapter->device_mode,
|
||||
pAdapter->sessionId);
|
||||
pAdapter->sessionCtx.ap.beacon = NULL;
|
||||
kfree(old);
|
||||
|
@@ -2922,8 +2922,7 @@ CDF_STATUS hdd_reset_all_adapters(hdd_context_t *hdd_ctx)
|
||||
adapter->sessionCtx.station.hdd_ReassocScenario = false;
|
||||
|
||||
hdd_deinit_tx_rx(adapter);
|
||||
cds_decr_session_set_pcl(
|
||||
adapter->device_mode,
|
||||
cds_decr_session_set_pcl(adapter->device_mode,
|
||||
adapter->sessionId);
|
||||
if (test_bit(WMM_INIT_DONE, &adapter->event_flags)) {
|
||||
hdd_wmm_adapter_close(adapter);
|
||||
@@ -6372,8 +6371,7 @@ void wlan_hdd_stop_sap(hdd_adapter_t *ap_adapter)
|
||||
}
|
||||
}
|
||||
clear_bit(SOFTAP_BSS_STARTED, &ap_adapter->event_flags);
|
||||
cds_decr_session_set_pcl(
|
||||
ap_adapter->device_mode,
|
||||
cds_decr_session_set_pcl(ap_adapter->device_mode,
|
||||
ap_adapter->sessionId);
|
||||
hddLog(CDF_TRACE_LEVEL_INFO_HIGH,
|
||||
FL("SAP Stop Success"));
|
||||
|
@@ -6875,9 +6875,7 @@ static int __iw_set_three_ints_getnone(struct net_device *dev,
|
||||
return -EPERM;
|
||||
}
|
||||
hdd_debug("%d %d %d", value[1], value[2], value[3]);
|
||||
cds_set_dual_mac_scan_config(
|
||||
value[1], value[2],
|
||||
value[3]);
|
||||
cds_set_dual_mac_scan_config(value[1], value[2], value[3]);
|
||||
break;
|
||||
default:
|
||||
hddLog(LOGE, "%s: Invalid IOCTL command %d", __func__, sub_cmd);
|
||||
@@ -9513,8 +9511,7 @@ static int __iw_set_two_ints_getnone(struct net_device *dev,
|
||||
return -EPERM;
|
||||
}
|
||||
hdd_debug("%d %d", value[1], value[2]);
|
||||
cds_set_dual_mac_fw_mode_config(
|
||||
value[1], value[2]);
|
||||
cds_set_dual_mac_fw_mode_config(value[1], value[2]);
|
||||
break;
|
||||
case WE_DUMP_DP_TRACE_LEVEL:
|
||||
hdd_info("WE_DUMP_DP_TRACE_LEVEL: %d %d",
|
||||
|
Reference in New Issue
Block a user