mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-10 06:09:23 -04:00
qcacld-3.0: cleanup cds_concurrency files
Remove hdd context from argument list of all the cds concurrency APIs. Change-Id: Ic9f94ab2e0f975a745776675c254ecbd5ba6b203 CRs-fixed: 956394
This commit is contained in:
Tushnim Bhattacharyya
Akash Patel
parent
4f20db56bc
commit
ca50b3204f
12 changed files with 669 additions and 596 deletions
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2012-2015 The Linux Foundation. All rights reserved.
|
||||
* Copyright (c) 2015-2016 The Linux Foundation. All rights reserved.
|
||||
*
|
||||
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
|
||||
*
|
||||
|
|
@ -463,139 +463,30 @@ struct cds_conc_connection_info {
|
|||
bool in_use;
|
||||
};
|
||||
|
||||
bool cds_is_connection_in_progress(hdd_context_t *hdd_ctx);
|
||||
void cds_dump_concurrency_info(hdd_context_t *pHddCtx);
|
||||
void cds_set_concurrency_mode(hdd_context_t *hdd_ctx,
|
||||
enum tCDF_ADAPTER_MODE mode);
|
||||
void cds_clear_concurrency_mode(hdd_context_t *pHddCtx,
|
||||
enum tCDF_ADAPTER_MODE mode);
|
||||
uint32_t cds_get_connection_count(hdd_context_t *hdd_ctx);
|
||||
/**
|
||||
* cds_is_sta_connection_pending() - This function will check if sta connection
|
||||
* is pending or not.
|
||||
* @hdd_ctx: pointer to hdd context
|
||||
*
|
||||
* This function will return the status of flag is_sta_connection_pending
|
||||
*
|
||||
* Return: true or false
|
||||
*/
|
||||
static inline bool
|
||||
cds_is_sta_connection_pending(hdd_context_t *hdd_ctx)
|
||||
{
|
||||
bool status;
|
||||
spin_lock(&hdd_ctx->sta_update_info_lock);
|
||||
status = hdd_ctx->is_sta_connection_pending;
|
||||
spin_unlock(&hdd_ctx->sta_update_info_lock);
|
||||
return status;
|
||||
}
|
||||
|
||||
/**
|
||||
* cds_change_sta_conn_pending_status() - This function will change the value
|
||||
* of is_sta_connection_pending
|
||||
* @hdd_ctx: pointer to hdd context
|
||||
* @value: value to set
|
||||
*
|
||||
* This function will change the value of is_sta_connection_pending
|
||||
*
|
||||
* Return: none
|
||||
*/
|
||||
static inline void
|
||||
cds_change_sta_conn_pending_status(hdd_context_t *hdd_ctx,
|
||||
bool value)
|
||||
{
|
||||
spin_lock(&hdd_ctx->sta_update_info_lock);
|
||||
hdd_ctx->is_sta_connection_pending = value;
|
||||
spin_unlock(&hdd_ctx->sta_update_info_lock);
|
||||
}
|
||||
|
||||
/**
|
||||
* cds_is_sap_restart_required() - This function will check if sap restart
|
||||
* is pending or not.
|
||||
* @hdd_ctx: pointer to hdd context.
|
||||
*
|
||||
* This function will return the status of flag is_sap_restart_required.
|
||||
*
|
||||
* Return: true or false
|
||||
*/
|
||||
static inline bool
|
||||
cds_is_sap_restart_required(hdd_context_t *hdd_ctx)
|
||||
{
|
||||
bool status;
|
||||
spin_lock(&hdd_ctx->sap_update_info_lock);
|
||||
status = hdd_ctx->is_sap_restart_required;
|
||||
spin_unlock(&hdd_ctx->sap_update_info_lock);
|
||||
return status;
|
||||
}
|
||||
|
||||
/**
|
||||
* cds_change_sap_restart_required_status() - This function will change the
|
||||
* value of is_sap_restart_required
|
||||
* @hdd_ctx: pointer to hdd context
|
||||
* @value: value to set
|
||||
*
|
||||
* This function will change the value of is_sap_restart_required
|
||||
*
|
||||
* Return: none
|
||||
*/
|
||||
static inline void
|
||||
cds_change_sap_restart_required_status(hdd_context_t *hdd_ctx,
|
||||
bool value)
|
||||
{
|
||||
spin_lock(&hdd_ctx->sap_update_info_lock);
|
||||
hdd_ctx->is_sap_restart_required = value;
|
||||
spin_unlock(&hdd_ctx->sap_update_info_lock);
|
||||
}
|
||||
|
||||
/**
|
||||
* cds_set_connection_in_progress() - to set the connection in progress flag
|
||||
* @hdd_ctx: pointer to hdd context
|
||||
* @value: value to set
|
||||
*
|
||||
* This function will set the passed value to connection in progress flag.
|
||||
* If value is previously being set to true then no need to set it again.
|
||||
*
|
||||
* Return: true if value is being set correctly and false otherwise.
|
||||
*/
|
||||
static inline bool
|
||||
cds_set_connection_in_progress(hdd_context_t *hdd_ctx,
|
||||
bool value)
|
||||
{
|
||||
bool status = true;
|
||||
spin_lock(&hdd_ctx->connection_status_lock);
|
||||
/*
|
||||
* if the value is set to true previously and if someone is
|
||||
* trying to make it true again then it could be some race
|
||||
* condition being triggered. Avoid this situation by returning
|
||||
* false
|
||||
*/
|
||||
if (hdd_ctx->connection_in_progress && value)
|
||||
status = false;
|
||||
else
|
||||
hdd_ctx->connection_in_progress = value;
|
||||
spin_unlock(&hdd_ctx->connection_status_lock);
|
||||
return status;
|
||||
}
|
||||
|
||||
|
||||
bool cds_is_connection_in_progress(void);
|
||||
void cds_dump_concurrency_info(void);
|
||||
void cds_set_concurrency_mode(enum tCDF_ADAPTER_MODE mode);
|
||||
void cds_clear_concurrency_mode(enum tCDF_ADAPTER_MODE mode);
|
||||
uint32_t cds_get_connection_count(void);
|
||||
bool cds_is_sta_connection_pending(void);
|
||||
void cds_change_sta_conn_pending_status(bool value);
|
||||
void cds_change_sap_restart_required_status(bool value);
|
||||
bool cds_set_connection_in_progress(bool value);
|
||||
int cds_cfg80211_get_concurrency_matrix(struct wiphy *wiphy,
|
||||
struct wireless_dev *wdev,
|
||||
const void *data,
|
||||
int data_len);
|
||||
uint32_t cds_get_concurrency_mode(void);
|
||||
CDF_STATUS cds_check_and_restart_sap(hdd_context_t *hdd_ctx,
|
||||
eCsrRoamResult roam_result,
|
||||
CDF_STATUS cds_check_and_restart_sap(eCsrRoamResult roam_result,
|
||||
hdd_station_ctx_t *hdd_sta_ctx);
|
||||
void cds_handle_conc_rule1(hdd_context_t *hdd_ctx,
|
||||
hdd_adapter_t *adapter,
|
||||
void cds_handle_conc_rule1(hdd_adapter_t *adapter,
|
||||
tCsrRoamProfile *roam_profile);
|
||||
#ifdef FEATURE_WLAN_CH_AVOID
|
||||
bool cds_handle_conc_rule2(hdd_context_t *hdd_ctx,
|
||||
hdd_adapter_t *adapter,
|
||||
bool cds_handle_conc_rule2(hdd_adapter_t *adapter,
|
||||
tCsrRoamProfile *roam_profile,
|
||||
uint32_t *roam_id);
|
||||
#else
|
||||
static inline bool cds_handle_conc_rule2(hdd_context_t *hdd_ctx,
|
||||
hdd_adapter_t *adapter,
|
||||
static inline bool cds_handle_conc_rule2(hdd_adapter_t *adapter,
|
||||
tCsrRoamProfile *roam_profile,
|
||||
uint32_t *roam_id)
|
||||
{
|
||||
|
|
@ -608,10 +499,9 @@ bool cds_check_for_session_conc(uint8_t session_id, uint8_t channel);
|
|||
CDF_STATUS cds_handle_conc_multiport(uint8_t session_id, uint8_t channel);
|
||||
|
||||
#ifdef FEATURE_WLAN_FORCE_SAP_SCC
|
||||
void cds_force_sap_on_scc(hdd_context_t *hdd_ctx, eCsrRoamResult roam_result);
|
||||
void cds_force_sap_on_scc(eCsrRoamResult roam_result);
|
||||
#else
|
||||
static inline void cds_force_sap_on_scc(hdd_context_t *hdd_ctx,
|
||||
eCsrRoamResult roam_result)
|
||||
static inline void cds_force_sap_on_scc(eCsrRoamResult roam_result)
|
||||
{
|
||||
|
||||
}
|
||||
|
|
@ -619,19 +509,17 @@ static inline void cds_force_sap_on_scc(hdd_context_t *hdd_ctx,
|
|||
|
||||
#ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH
|
||||
void cds_check_concurrent_intf_and_restart_sap(
|
||||
hdd_context_t *hdd_ctx,
|
||||
hdd_station_ctx_t *hdd_sta_ctx,
|
||||
hdd_adapter_t *adapter);
|
||||
#else
|
||||
static inline void cds_check_concurrent_intf_and_restart_sap(
|
||||
hdd_context_t *hdd_ctx,
|
||||
hdd_station_ctx_t *hdd_sta_ctx,
|
||||
hdd_adapter_t *adapter)
|
||||
{
|
||||
|
||||
}
|
||||
#endif /* FEATURE_WLAN_MCC_TO_SCC_SWITCH */
|
||||
uint8_t cds_is_mcc_in_24G(hdd_context_t *hdd_ctx);
|
||||
uint8_t cds_is_mcc_in_24G(void);
|
||||
int32_t cds_set_mas(hdd_adapter_t *adapter, uint8_t mas_value);
|
||||
int cds_set_mcc_p2p_quota(hdd_adapter_t *hostapd_adapter,
|
||||
uint32_t set_value);
|
||||
|
|
@ -652,61 +540,47 @@ static inline void cds_restart_sap(hdd_adapter_t *ap_adapter)
|
|||
*/
|
||||
|
||||
#ifdef FEATURE_WLAN_STA_AP_MODE_DFS_DISABLE
|
||||
void cds_check_and_restart_sap_with_non_dfs_acs(hdd_context_t *hdd_ctx);
|
||||
void cds_check_and_restart_sap_with_non_dfs_acs(void);
|
||||
#else
|
||||
static inline void cds_check_and_restart_sap_with_non_dfs_acs(
|
||||
hdd_context_t *hdd_ctx)
|
||||
static inline void cds_check_and_restart_sap_with_non_dfs_acs(void)
|
||||
{
|
||||
|
||||
}
|
||||
#endif /* FEATURE_WLAN_STA_AP_MODE_DFS_DISABLE */
|
||||
void cds_incr_active_session(hdd_context_t *pHddCtx,
|
||||
enum tCDF_ADAPTER_MODE mode,
|
||||
void cds_incr_active_session(enum tCDF_ADAPTER_MODE mode,
|
||||
uint8_t sessionId);
|
||||
void cds_decr_active_session(hdd_context_t *pHddCtx,
|
||||
enum tCDF_ADAPTER_MODE mode,
|
||||
void cds_decr_active_session(enum tCDF_ADAPTER_MODE mode,
|
||||
uint8_t sessionId);
|
||||
void cds_decr_session_set_pcl(hdd_context_t *hdd_ctx,
|
||||
enum tCDF_ADAPTER_MODE mode,
|
||||
void cds_decr_session_set_pcl(enum tCDF_ADAPTER_MODE mode,
|
||||
uint8_t session_id);
|
||||
CDF_STATUS cds_init_policy_mgr(hdd_context_t *hdd_ctx);
|
||||
CDF_STATUS cds_get_pcl(hdd_context_t *hdd_ctx, enum cds_con_mode mode,
|
||||
CDF_STATUS cds_init_policy_mgr(void);
|
||||
CDF_STATUS cds_get_pcl(enum cds_con_mode mode,
|
||||
uint8_t *pcl_Channels, uint32_t *len);
|
||||
bool cds_allow_concurrency(hdd_context_t *hdd_ctx, enum cds_con_mode mode,
|
||||
bool cds_allow_concurrency(enum cds_con_mode mode,
|
||||
uint8_t channel, enum hw_mode_bandwidth bw);
|
||||
enum cds_conc_priority_mode cds_get_first_connection_pcl_table_index(
|
||||
hdd_context_t *hdd_ctx);
|
||||
enum cds_one_connection_mode cds_get_second_connection_pcl_table_index(
|
||||
hdd_context_t *hdd_ctx);
|
||||
enum cds_two_connection_mode cds_get_third_connection_pcl_table_index(
|
||||
hdd_context_t *hdd_ctx);
|
||||
CDF_STATUS cds_mode_switch_dbs_to_mcc(hdd_context_t *hdd_ctx);
|
||||
CDF_STATUS cds_mode_switch_mcc_to_dbs(hdd_context_t *hdd_ctx);
|
||||
CDF_STATUS cds_incr_connection_count(hdd_context_t *hdd_ctx,
|
||||
uint32_t vdev_id);
|
||||
CDF_STATUS cds_update_connection_info(hdd_context_t *hdd_ctx,
|
||||
uint32_t vdev_id);
|
||||
CDF_STATUS cds_decr_connection_count(hdd_context_t *hdd_ctx,
|
||||
uint32_t vdev_id);
|
||||
enum cds_conc_priority_mode cds_get_first_connection_pcl_table_index(void);
|
||||
enum cds_one_connection_mode cds_get_second_connection_pcl_table_index(void);
|
||||
enum cds_two_connection_mode cds_get_third_connection_pcl_table_index(void);
|
||||
CDF_STATUS cds_incr_connection_count(uint32_t vdev_id);
|
||||
CDF_STATUS cds_update_connection_info(uint32_t vdev_id);
|
||||
CDF_STATUS cds_decr_connection_count(uint32_t vdev_id);
|
||||
CDF_STATUS cds_current_connections_update(uint32_t session_id,
|
||||
uint8_t channel,
|
||||
enum cds_conn_update_reason);
|
||||
bool cds_is_ibss_conn_exist(hdd_context_t *hdd_ctx, uint8_t *ibss_channel);
|
||||
bool cds_is_ibss_conn_exist(uint8_t *ibss_channel);
|
||||
#ifdef MPC_UT_FRAMEWORK
|
||||
CDF_STATUS cds_incr_connection_count_utfw(hdd_context_t *hdd_ctx,
|
||||
CDF_STATUS cds_incr_connection_count_utfw(
|
||||
uint32_t vdev_id, uint32_t tx_streams, uint32_t rx_streams,
|
||||
uint32_t chain_mask, uint32_t type, uint32_t sub_type,
|
||||
uint32_t channelid, uint32_t mac_id);
|
||||
CDF_STATUS cds_update_connection_info_utfw(hdd_context_t *hdd_ctx,
|
||||
CDF_STATUS cds_update_connection_info_utfw(
|
||||
uint32_t vdev_id, uint32_t tx_streams, uint32_t rx_streams,
|
||||
uint32_t chain_mask, uint32_t type, uint32_t sub_type,
|
||||
uint32_t channelid, uint32_t mac_id);
|
||||
CDF_STATUS cds_decr_connection_count_utfw(hdd_context_t *hdd_ctx,
|
||||
CDF_STATUS cds_decr_connection_count_utfw(
|
||||
uint32_t del_all, uint32_t vdev_id);
|
||||
struct cds_conc_connection_info *cds_get_conn_info(hdd_context_t *hdd_ctx,
|
||||
uint32_t *len);
|
||||
enum cds_pcl_type get_pcl_from_first_conn_table(
|
||||
enum cds_con_mode type,
|
||||
struct cds_conc_connection_info *cds_get_conn_info(uint32_t *len);
|
||||
enum cds_pcl_type get_pcl_from_first_conn_table(enum cds_con_mode type,
|
||||
enum cds_conc_priority_mode sys_pref);
|
||||
enum cds_pcl_type get_pcl_from_second_conn_table(
|
||||
enum cds_one_connection_mode idx, enum cds_con_mode type,
|
||||
|
|
@ -715,39 +589,33 @@ enum cds_pcl_type get_pcl_from_third_conn_table(
|
|||
enum cds_two_connection_mode idx, enum cds_con_mode type,
|
||||
enum cds_conc_priority_mode sys_pref, uint8_t dbs_capable);
|
||||
#else
|
||||
static inline CDF_STATUS cds_incr_connection_count_utfw(
|
||||
hdd_context_t *hdd_ctx, uint32_t vdev_id,
|
||||
static inline CDF_STATUS cds_incr_connection_count_utfw(uint32_t vdev_id,
|
||||
uint32_t tx_streams, uint32_t rx_streams,
|
||||
uint32_t chain_mask, uint32_t type, uint32_t sub_type,
|
||||
uint32_t channelid, uint32_t mac_id)
|
||||
{
|
||||
return CDF_STATUS_SUCCESS;
|
||||
}
|
||||
static inline CDF_STATUS cds_update_connection_info_utfw(
|
||||
hdd_context_t *hdd_ctx, uint32_t vdev_id,
|
||||
static inline CDF_STATUS cds_update_connection_info_utfw(uint32_t vdev_id,
|
||||
uint32_t tx_streams, uint32_t rx_streams,
|
||||
uint32_t chain_mask, uint32_t type, uint32_t sub_type,
|
||||
uint32_t channelid, uint32_t mac_id)
|
||||
{
|
||||
return CDF_STATUS_SUCCESS;
|
||||
}
|
||||
static inline CDF_STATUS cds_decr_connection_count_utfw(
|
||||
hdd_context_t *hdd_ctx,
|
||||
uint32_t del_all, uint32_t vdev_id)
|
||||
static inline CDF_STATUS cds_decr_connection_count_utfw(uint32_t del_all,
|
||||
uint32_t vdev_id)
|
||||
{
|
||||
return CDF_STATUS_SUCCESS;
|
||||
}
|
||||
static inline struct cds_conc_connection_info *cds_get_conn_info(
|
||||
hdd_context_t *hdd_ctx, uint32_t *len)
|
||||
static inline struct cds_conc_connection_info *cds_get_conn_info(uint32_t *len)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
#endif
|
||||
enum cds_con_mode cds_convert_device_mode_to_hdd_type(
|
||||
device_mode_t device_mode);
|
||||
uint32_t cds_get_connection_count(hdd_context_t *hdd_ctx);
|
||||
CDF_STATUS cds_soc_set_hw_mode(hdd_context_t *hdd_ctx,
|
||||
uint32_t session_id,
|
||||
CDF_STATUS cds_soc_set_hw_mode(uint32_t session_id,
|
||||
enum hw_mode_ss_config mac0_ss,
|
||||
enum hw_mode_bandwidth mac0_bw,
|
||||
enum hw_mode_ss_config mac1_ss,
|
||||
|
|
@ -755,24 +623,20 @@ CDF_STATUS cds_soc_set_hw_mode(hdd_context_t *hdd_ctx,
|
|||
enum hw_mode_dbs_capab dbs,
|
||||
enum hw_mode_agile_dfs_capab dfs,
|
||||
enum cds_conn_update_reason reason);
|
||||
enum cds_conc_next_action cds_need_opportunistic_upgrade(
|
||||
hdd_context_t *hdd_ctx);
|
||||
CDF_STATUS cds_next_actions(
|
||||
hdd_context_t *hdd_ctx, uint32_t session_id,
|
||||
enum cds_conc_next_action cds_need_opportunistic_upgrade(void);
|
||||
CDF_STATUS cds_next_actions(uint32_t session_id,
|
||||
enum cds_conc_next_action action,
|
||||
enum cds_conn_update_reason reason);
|
||||
void cds_set_dual_mac_scan_config(hdd_context_t *hdd_ctx,
|
||||
uint8_t dbs_val,
|
||||
void cds_set_dual_mac_scan_config(uint8_t dbs_val,
|
||||
uint8_t dbs_plus_agile_scan_val,
|
||||
uint8_t single_mac_scan_with_dbs_val);
|
||||
void cds_set_dual_mac_fw_mode_config(hdd_context_t *hdd_ctx,
|
||||
uint8_t dbs,
|
||||
void cds_set_dual_mac_fw_mode_config(uint8_t dbs,
|
||||
uint8_t dfs);
|
||||
void cds_soc_set_dual_mac_cfg_cb(enum set_hw_mode_status status,
|
||||
uint32_t scan_config,
|
||||
uint32_t fw_mode_config);
|
||||
bool cds_map_concurrency_mode(hdd_context_t *hdd_ctx,
|
||||
enum tCDF_ADAPTER_MODE *old_mode, enum cds_con_mode *new_mode);
|
||||
bool cds_map_concurrency_mode(enum tCDF_ADAPTER_MODE *old_mode,
|
||||
enum cds_con_mode *new_mode);
|
||||
CDF_STATUS cds_get_channel_from_scan_result(hdd_adapter_t *adapter,
|
||||
tCsrRoamProfile *roam_profile, uint8_t *channel);
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2012-2015 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.
|
||||
*
|
||||
|
|
@ -730,7 +730,7 @@ static void hdd_send_association_event(struct net_device *dev,
|
|||
return;
|
||||
}
|
||||
|
||||
cds_incr_active_session(pHddCtx, pAdapter->device_mode,
|
||||
cds_incr_active_session(pAdapter->device_mode,
|
||||
pAdapter->sessionId);
|
||||
memcpy(wrqu.ap_addr.sa_data, pCsrRoamInfo->pBssDesc->bssId,
|
||||
sizeof(pCsrRoamInfo->pBssDesc->bssId));
|
||||
|
|
@ -815,8 +815,7 @@ static void hdd_send_association_event(struct net_device *dev,
|
|||
#endif
|
||||
} else if (eConnectionState_IbssConnected == /* IBss Associated */
|
||||
pHddStaCtx->conn_info.connState) {
|
||||
cds_update_connection_info(pHddCtx,
|
||||
pAdapter->sessionId);
|
||||
cds_update_connection_info(pAdapter->sessionId);
|
||||
memcpy(wrqu.ap_addr.sa_data, pHddStaCtx->conn_info.bssId.bytes,
|
||||
ETH_ALEN);
|
||||
pr_info("wlan: new IBSS connection to " MAC_ADDRESS_STR "\n",
|
||||
|
|
@ -826,7 +825,7 @@ static void hdd_send_association_event(struct net_device *dev,
|
|||
pr_info("wlan: disconnected\n");
|
||||
memset(wrqu.ap_addr.sa_data, '\0', ETH_ALEN);
|
||||
cds_decr_session_set_pcl(
|
||||
pHddCtx, pAdapter->device_mode,
|
||||
pAdapter->device_mode,
|
||||
pAdapter->sessionId);
|
||||
#if defined(FEATURE_WLAN_LFR)
|
||||
wlan_hdd_enable_roaming(pAdapter);
|
||||
|
|
@ -872,7 +871,7 @@ static void hdd_send_association_event(struct net_device *dev,
|
|||
hdd_stop_bus_bw_compute_timer(pAdapter);
|
||||
#endif
|
||||
}
|
||||
cds_dump_concurrency_info(pHddCtx);
|
||||
cds_dump_concurrency_info();
|
||||
/* Send SCC/MCC Switching event to IPA */
|
||||
hdd_ipa_send_mcc_scc_msg(pHddCtx, pHddCtx->mcc_mode);
|
||||
|
||||
|
|
@ -1419,7 +1418,7 @@ static void hdd_send_re_assoc_event(struct net_device *dev,
|
|||
* successful reassoc decrement the active session count here.
|
||||
*/
|
||||
cds_decr_session_set_pcl(
|
||||
pHddCtx, pAdapter->device_mode,
|
||||
pAdapter->device_mode,
|
||||
pAdapter->sessionId);
|
||||
|
||||
/* Send the Assoc Resp, the supplicant needs this for initial Auth */
|
||||
|
|
@ -1772,7 +1771,7 @@ defined(WLAN_FEATURE_VOWIFI_11R)
|
|||
/* Indicate 'connect' status to user space */
|
||||
hdd_send_association_event(dev, pRoamInfo);
|
||||
|
||||
if (cds_is_mcc_in_24G(pHddCtx)) {
|
||||
if (cds_is_mcc_in_24G()) {
|
||||
if (pHddCtx->miracast_value)
|
||||
cds_set_mas(pAdapter, pHddCtx->miracast_value);
|
||||
}
|
||||
|
|
@ -1849,7 +1848,7 @@ defined(FEATURE_WLAN_LFR)
|
|||
wlan_hdd_auto_shutdown_enable(pHddCtx, false);
|
||||
#endif
|
||||
|
||||
cds_check_concurrent_intf_and_restart_sap(pHddCtx,
|
||||
cds_check_concurrent_intf_and_restart_sap(
|
||||
pHddStaCtx,
|
||||
pAdapter);
|
||||
|
||||
|
|
@ -1967,8 +1966,7 @@ defined(FEATURE_WLAN_LFR)
|
|||
* count here.
|
||||
*/
|
||||
cds_decr_session_set_pcl
|
||||
(pHddCtx,
|
||||
pAdapter->device_mode,
|
||||
(pAdapter->device_mode,
|
||||
pAdapter->sessionId);
|
||||
hddLog(LOG1,
|
||||
FL("ft_carrier_on is %d, sending roamed indication"),
|
||||
|
|
@ -2335,11 +2333,11 @@ defined(FEATURE_WLAN_LFR)
|
|||
WLAN_CONTROL_PATH);
|
||||
}
|
||||
|
||||
if (CDF_STATUS_SUCCESS != cds_check_and_restart_sap(pHddCtx,
|
||||
if (CDF_STATUS_SUCCESS != cds_check_and_restart_sap(
|
||||
roamResult, pHddStaCtx))
|
||||
return CDF_STATUS_E_FAILURE;
|
||||
|
||||
cds_force_sap_on_scc(pHddCtx, roamResult);
|
||||
cds_force_sap_on_scc(roamResult);
|
||||
|
||||
return CDF_STATUS_SUCCESS;
|
||||
}
|
||||
|
|
@ -2461,12 +2459,11 @@ static void hdd_roam_ibss_indication_handler(hdd_adapter_t *pAdapter,
|
|||
bss);
|
||||
}
|
||||
if (eCSR_ROAM_RESULT_IBSS_STARTED == roamResult) {
|
||||
cds_incr_active_session(pHddCtx, pAdapter->device_mode,
|
||||
cds_incr_active_session(pAdapter->device_mode,
|
||||
pAdapter->sessionId);
|
||||
} else if (eCSR_ROAM_RESULT_IBSS_JOIN_SUCCESS == roamResult ||
|
||||
eCSR_ROAM_RESULT_IBSS_COALESCED == roamResult) {
|
||||
cds_update_connection_info(pHddCtx,
|
||||
pAdapter->sessionId);
|
||||
cds_update_connection_info(pAdapter->sessionId);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2012-2015 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.
|
||||
*
|
||||
|
|
@ -1537,7 +1537,7 @@ static int __wlan_hdd_cfg80211_do_acs(struct wiphy *wiphy,
|
|||
hdd_debug("get pcl for DO_ACS vendor command");
|
||||
|
||||
/* consult policy manager to get PCL */
|
||||
status = cds_get_pcl(hdd_ctx, CDS_SAP_MODE,
|
||||
status = cds_get_pcl(CDS_SAP_MODE,
|
||||
sap_config->acs_cfg.pcl_channels,
|
||||
&sap_config->acs_cfg.pcl_ch_count);
|
||||
if (CDF_STATUS_SUCCESS != status)
|
||||
|
|
@ -4113,7 +4113,7 @@ static int __wlan_hdd_cfg80211_get_preferred_freq_list(struct wiphy *wiphy,
|
|||
|
||||
hdd_debug("Userspace requested pref freq list");
|
||||
|
||||
status = cds_get_pcl(hdd_ctx, intf_mode, pcl, &pcl_len);
|
||||
status = cds_get_pcl(intf_mode, pcl, &pcl_len);
|
||||
if (status != CDF_STATUS_SUCCESS) {
|
||||
hdd_err("Get pcl failed");
|
||||
return -EINVAL;
|
||||
|
|
@ -4237,7 +4237,7 @@ static int __wlan_hdd_cfg80211_set_probable_oper_channel(struct wiphy *wiphy,
|
|||
[QCA_WLAN_VENDOR_ATTR_PROBABLE_OPER_CHANNEL_FREQ]));
|
||||
|
||||
/* check pcl table */
|
||||
if (!cds_allow_concurrency(hdd_ctx, intf_mode,
|
||||
if (!cds_allow_concurrency(intf_mode,
|
||||
channel_hint, HW_MODE_20_MHZ)) {
|
||||
hdd_err("Set channel hint failed due to concurrency check");
|
||||
return -EINVAL;
|
||||
|
|
@ -6037,7 +6037,7 @@ static int __wlan_hdd_cfg80211_change_iface(struct wiphy *wiphy,
|
|||
hddLog(CDF_TRACE_LEVEL_INFO, FL("Device_mode = %d, IFTYPE = 0x%x"),
|
||||
pAdapter->device_mode, type);
|
||||
|
||||
if (!cds_allow_concurrency(pHddCtx,
|
||||
if (!cds_allow_concurrency(
|
||||
wlan_hdd_convert_nl_iftype_to_hdd_type(type),
|
||||
0, HW_MODE_20_MHZ)) {
|
||||
hddLog(CDF_TRACE_LEVEL_DEBUG,
|
||||
|
|
@ -6049,7 +6049,7 @@ static int __wlan_hdd_cfg80211_change_iface(struct wiphy *wiphy,
|
|||
wdev = ndev->ieee80211_ptr;
|
||||
|
||||
/* Reset the current device mode bit mask */
|
||||
cds_clear_concurrency_mode(pHddCtx, pAdapter->device_mode);
|
||||
cds_clear_concurrency_mode(pAdapter->device_mode);
|
||||
|
||||
hdd_tdls_notify_mode_change(pAdapter, pHddCtx);
|
||||
|
||||
|
|
@ -6231,7 +6231,7 @@ static int __wlan_hdd_cfg80211_change_iface(struct wiphy *wiphy,
|
|||
|
||||
done:
|
||||
/* Set bitmask based on updated value */
|
||||
cds_set_concurrency_mode(pHddCtx, pAdapter->device_mode);
|
||||
cds_set_concurrency_mode(pAdapter->device_mode);
|
||||
|
||||
#ifdef WLAN_FEATURE_LPSS
|
||||
wlan_hdd_send_all_scan_intf_info(pHddCtx);
|
||||
|
|
@ -7955,7 +7955,7 @@ int wlan_hdd_cfg80211_connect_start(hdd_adapter_t *pAdapter,
|
|||
}
|
||||
|
||||
if (pHddCtx->config->policy_manager_enabled &&
|
||||
(true == cds_is_connection_in_progress(pHddCtx))) {
|
||||
(true == cds_is_connection_in_progress())) {
|
||||
hdd_err("Connection refused: conn in progress");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
|
@ -7994,9 +7994,9 @@ 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(pHddCtx, pAdapter,
|
||||
cds_handle_conc_rule1(pAdapter,
|
||||
pRoamProfile);
|
||||
if (true != cds_handle_conc_rule2(pHddCtx,
|
||||
if (true != cds_handle_conc_rule2(
|
||||
pAdapter, pRoamProfile, &roamId))
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -8829,7 +8829,7 @@ static int __wlan_hdd_cfg80211_connect(struct wiphy *wiphy,
|
|||
if (0 != status)
|
||||
return status;
|
||||
if (req->channel) {
|
||||
if (!cds_allow_concurrency(pHddCtx,
|
||||
if (!cds_allow_concurrency(
|
||||
cds_convert_device_mode_to_hdd_type(
|
||||
pAdapter->device_mode),
|
||||
req->channel->hw_value, HW_MODE_20_MHZ)) {
|
||||
|
|
@ -8837,7 +8837,7 @@ static int __wlan_hdd_cfg80211_connect(struct wiphy *wiphy,
|
|||
return -ECONNREFUSED;
|
||||
}
|
||||
} else {
|
||||
if (!cds_allow_concurrency(pHddCtx,
|
||||
if (!cds_allow_concurrency(
|
||||
cds_convert_device_mode_to_hdd_type(
|
||||
pAdapter->device_mode), 0, HW_MODE_20_MHZ)) {
|
||||
hdd_err("This concurrency combination is not allowed");
|
||||
|
|
@ -9345,7 +9345,7 @@ static int __wlan_hdd_cfg80211_join_ibss(struct wiphy *wiphy,
|
|||
}
|
||||
}
|
||||
|
||||
if (!cds_allow_concurrency(pHddCtx, CDS_IBSS_MODE, channelNum,
|
||||
if (!cds_allow_concurrency(CDS_IBSS_MODE, channelNum,
|
||||
HW_MODE_20_MHZ)) {
|
||||
hdd_err("This concurrency combination is not allowed");
|
||||
return -ECONNREFUSED;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c)2015 The Linux Foundation. All rights reserved.
|
||||
* Copyright (c) 2015-2016 The Linux Foundation. All rights reserved.
|
||||
*
|
||||
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
|
||||
*
|
||||
|
|
@ -633,7 +633,7 @@ void wlan_hdd_one_connection_scenario(hdd_context_t *hdd_ctx)
|
|||
CDF_STATUS ret;
|
||||
|
||||
/* flush the entire table first */
|
||||
ret = cds_init_policy_mgr(hdd_ctx);
|
||||
ret = cds_init_policy_mgr();
|
||||
if (!CDF_IS_STATUS_SUCCESS(ret)) {
|
||||
hdd_err("Policy manager initialization failed");
|
||||
return;
|
||||
|
|
@ -641,7 +641,7 @@ void wlan_hdd_one_connection_scenario(hdd_context_t *hdd_ctx)
|
|||
|
||||
for (sub_type = 0; sub_type < CDS_MAX_NUM_OF_MODE; sub_type++) {
|
||||
/* validate one connection is created or no */
|
||||
if (cds_get_connection_count(hdd_ctx) != 0) {
|
||||
if (cds_get_connection_count() != 0) {
|
||||
hddLog(LOGE,
|
||||
FL("Test failed - No. of connection is not 0"));
|
||||
return;
|
||||
|
|
@ -651,7 +651,7 @@ void wlan_hdd_one_connection_scenario(hdd_context_t *hdd_ctx)
|
|||
pcl_type = get_pcl_from_first_conn_table(sub_type, system_pref);
|
||||
|
||||
/* check PCL value for second connection is correct or no */
|
||||
cds_get_pcl(hdd_ctx, sub_type, pcl, &pcl_len);
|
||||
cds_get_pcl(sub_type, pcl, &pcl_len);
|
||||
status = wlan_hdd_validate_pcl(hdd_ctx,
|
||||
pcl_type, pcl, pcl_len, 0, 0,
|
||||
reason, sizeof(reason));
|
||||
|
|
@ -688,7 +688,7 @@ void wlan_hdd_two_connections_scenario(hdd_context_t *hdd_ctx,
|
|||
type = wlan_hdd_valid_type_of_persona(sub_type);
|
||||
|
||||
/* flush the entire table first */
|
||||
ret = cds_init_policy_mgr(hdd_ctx);
|
||||
ret = cds_init_policy_mgr();
|
||||
if (!CDF_IS_STATUS_SUCCESS(ret)) {
|
||||
hdd_err("Policy manager initialization failed");
|
||||
return;
|
||||
|
|
@ -697,11 +697,11 @@ void wlan_hdd_two_connections_scenario(hdd_context_t *hdd_ctx,
|
|||
/* sub_type mapping between HDD and WMA are different */
|
||||
wlan_hdd_map_subtypes_hdd_wma(&dummy_type, &sub_type);
|
||||
/* add first connection as STA */
|
||||
cds_incr_connection_count_utfw(hdd_ctx, vdevid, tx_stream,
|
||||
cds_incr_connection_count_utfw(vdevid, tx_stream,
|
||||
rx_stream, chain_mask, type, dummy_type,
|
||||
channel_id, mac_id);
|
||||
/* validate one connection is created or no */
|
||||
if (cds_get_connection_count(hdd_ctx) != 1) {
|
||||
if (cds_get_connection_count() != 1) {
|
||||
hddLog(LOGE,
|
||||
FL("Test failed - No. of connection is not 1"));
|
||||
return;
|
||||
|
|
@ -710,8 +710,7 @@ void wlan_hdd_two_connections_scenario(hdd_context_t *hdd_ctx,
|
|||
while (next_sub_type < CDS_MAX_NUM_OF_MODE) {
|
||||
/* get the PCL value & check the channels accordingly */
|
||||
second_index =
|
||||
cds_get_second_connection_pcl_table_index(
|
||||
hdd_ctx);
|
||||
cds_get_second_connection_pcl_table_index();
|
||||
if (CDS_MAX_ONE_CONNECTION_MODE == second_index) {
|
||||
/* not valid combination*/
|
||||
hddLog(LOGE, FL("couldn't find index for 2nd connection pcl table"));
|
||||
|
|
@ -724,7 +723,7 @@ void wlan_hdd_two_connections_scenario(hdd_context_t *hdd_ctx,
|
|||
next_sub_type, system_pref,
|
||||
wma_is_hw_dbs_capable());
|
||||
/* check PCL for second connection is correct or no */
|
||||
cds_get_pcl(hdd_ctx, next_sub_type, pcl, &pcl_len);
|
||||
cds_get_pcl(next_sub_type, pcl, &pcl_len);
|
||||
status = wlan_hdd_validate_pcl(hdd_ctx,
|
||||
pcl_type, pcl, pcl_len, channel_id, 0,
|
||||
reason, sizeof(reason));
|
||||
|
|
@ -787,7 +786,7 @@ void wlan_hdd_three_connections_scenario(hdd_context_t *hdd_ctx,
|
|||
|
||||
type_1 = wlan_hdd_valid_type_of_persona(sub_type_1);
|
||||
/* flush the entire table first */
|
||||
ret = cds_init_policy_mgr(hdd_ctx);
|
||||
ret = cds_init_policy_mgr();
|
||||
if (!CDF_IS_STATUS_SUCCESS(ret)) {
|
||||
hdd_err("Policy manager initialization failed");
|
||||
return;
|
||||
|
|
@ -796,11 +795,11 @@ void wlan_hdd_three_connections_scenario(hdd_context_t *hdd_ctx,
|
|||
/* sub_type mapping between HDD and WMA are different */
|
||||
wlan_hdd_map_subtypes_hdd_wma(&dummy_type_1, &sub_type_1);
|
||||
/* add first connection as STA */
|
||||
cds_incr_connection_count_utfw(hdd_ctx, vdevid_1,
|
||||
cds_incr_connection_count_utfw(vdevid_1,
|
||||
tx_stream_1, rx_stream_1, chain_mask_1, type_1,
|
||||
dummy_type_1, channel_id_1, mac_id_1);
|
||||
/* validate one connection is created or no */
|
||||
if (cds_get_connection_count(hdd_ctx) != 1) {
|
||||
if (cds_get_connection_count() != 1) {
|
||||
hddLog(LOGE,
|
||||
FL("Test fail - No. of connection not 1"));
|
||||
return;
|
||||
|
|
@ -812,11 +811,11 @@ void wlan_hdd_three_connections_scenario(hdd_context_t *hdd_ctx,
|
|||
/* sub_type mapping between HDD and WMA are different */
|
||||
wlan_hdd_map_subtypes_hdd_wma(&dummy_type_2,
|
||||
&sub_type_2);
|
||||
cds_incr_connection_count_utfw(hdd_ctx, vdevid_2,
|
||||
cds_incr_connection_count_utfw(vdevid_2,
|
||||
tx_stream_2, rx_stream_2, chain_mask_2, type_2,
|
||||
dummy_type_2, channel_id_2, mac_id_2);
|
||||
/* validate two connections are created or no */
|
||||
if (cds_get_connection_count(hdd_ctx) != 2) {
|
||||
if (cds_get_connection_count() != 2) {
|
||||
hddLog(LOGE,
|
||||
FL("Test fail - No. connection not 2"));
|
||||
return;
|
||||
|
|
@ -824,8 +823,7 @@ void wlan_hdd_three_connections_scenario(hdd_context_t *hdd_ctx,
|
|||
next_sub_type = CDS_STA_MODE;
|
||||
while (next_sub_type < CDS_MAX_NUM_OF_MODE) {
|
||||
third_index =
|
||||
cds_get_third_connection_pcl_table_index(
|
||||
hdd_ctx);
|
||||
cds_get_third_connection_pcl_table_index();
|
||||
if (CDS_MAX_TWO_CONNECTION_MODE ==
|
||||
third_index) {
|
||||
/* not valid combination */
|
||||
|
|
@ -839,7 +837,7 @@ void wlan_hdd_three_connections_scenario(hdd_context_t *hdd_ctx,
|
|||
third_index, next_sub_type,
|
||||
system_pref,
|
||||
wma_is_hw_dbs_capable());
|
||||
cds_get_pcl(hdd_ctx, next_sub_type,
|
||||
cds_get_pcl(next_sub_type,
|
||||
pcl, &pcl_len);
|
||||
status = wlan_hdd_validate_pcl(hdd_ctx,
|
||||
pcl_type, pcl, pcl_len,
|
||||
|
|
@ -858,7 +856,7 @@ void wlan_hdd_three_connections_scenario(hdd_context_t *hdd_ctx,
|
|||
next_sub_type++;
|
||||
}
|
||||
/* remove entry to make a room for next iteration */
|
||||
cds_decr_connection_count(hdd_ctx, vdevid_2);
|
||||
cds_decr_connection_count(vdevid_2);
|
||||
}
|
||||
next_sub_type = CDS_STA_MODE;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2012-2015 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.
|
||||
*
|
||||
|
|
@ -556,7 +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(pHddCtx,
|
||||
cds_decr_session_set_pcl(
|
||||
pHostapdAdapter->device_mode,
|
||||
pHostapdAdapter->sessionId);
|
||||
}
|
||||
|
|
@ -589,7 +589,7 @@ static void hdd_issue_stored_joinreq(hdd_adapter_t *sta_adapter,
|
|||
}
|
||||
hal_handle = WLAN_HDD_GET_HAL_CTX(sta_adapter);
|
||||
|
||||
if (true == cds_is_sta_connection_pending(hdd_ctx)) {
|
||||
if (true == cds_is_sta_connection_pending()) {
|
||||
MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
|
||||
TRACE_CODE_HDD_ISSUE_JOIN_REQ,
|
||||
sta_adapter->sessionId, roam_id));
|
||||
|
|
@ -601,7 +601,7 @@ static void hdd_issue_stored_joinreq(hdd_adapter_t *sta_adapter,
|
|||
hdd_conn_set_connection_state(sta_adapter,
|
||||
eConnectionState_NotConnected);
|
||||
}
|
||||
cds_change_sta_conn_pending_status(hdd_ctx, false);
|
||||
cds_change_sta_conn_pending_status(false);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -999,7 +999,7 @@ CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
|
|||
wrqu.data.length = strlen(startBssEvent);
|
||||
we_event = IWEVCUSTOM;
|
||||
we_custom_event_generic = we_custom_start_event;
|
||||
cds_dump_concurrency_info(pHddCtx);
|
||||
cds_dump_concurrency_info();
|
||||
/* Send SCC/MCC Switching event to IPA */
|
||||
hdd_ipa_send_mcc_scc_msg(pHddCtx, pHddCtx->mcc_mode);
|
||||
break; /* Event will be sent after Switch-Case stmt */
|
||||
|
|
@ -1792,7 +1792,7 @@ stopbss:
|
|||
we_custom_event_generic = we_custom_event;
|
||||
wireless_send_event(dev, we_event, &wrqu,
|
||||
(char *)we_custom_event_generic);
|
||||
cds_dump_concurrency_info(pHddCtx);
|
||||
cds_dump_concurrency_info();
|
||||
/* Send SCC/MCC Switching event to IPA */
|
||||
hdd_ipa_send_mcc_scc_msg(pHddCtx, pHddCtx->mcc_mode);
|
||||
}
|
||||
|
|
@ -4976,7 +4976,7 @@ __iw_softap_stopbss(struct net_device *dev,
|
|||
}
|
||||
}
|
||||
clear_bit(SOFTAP_BSS_STARTED, &pHostapdAdapter->event_flags);
|
||||
cds_decr_session_set_pcl(hdd_ctx,
|
||||
cds_decr_session_set_pcl(
|
||||
pHostapdAdapter->device_mode,
|
||||
pHostapdAdapter->sessionId);
|
||||
}
|
||||
|
|
@ -7237,7 +7237,7 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter,
|
|||
uint16_t prev_rsn_length = 0;
|
||||
ENTER();
|
||||
|
||||
if (cds_is_connection_in_progress(pHddCtx)) {
|
||||
if (cds_is_connection_in_progress()) {
|
||||
hdd_err("Can't start BSS: connection is in progress");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
|
@ -7661,7 +7661,7 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter,
|
|||
return 0;
|
||||
}
|
||||
|
||||
if (!cds_allow_concurrency(pHddCtx,
|
||||
if (!cds_allow_concurrency(
|
||||
cds_convert_device_mode_to_hdd_type(
|
||||
pHostapdAdapter->device_mode),
|
||||
pConfig->channel, HW_MODE_20_MHZ)) {
|
||||
|
|
@ -7670,7 +7670,7 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter,
|
|||
return -EINVAL;
|
||||
}
|
||||
|
||||
if (!cds_set_connection_in_progress(pHddCtx, true)) {
|
||||
if (!cds_set_connection_in_progress(true)) {
|
||||
hdd_err("Can't start BSS: set connnection in progress failed");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
|
@ -7693,7 +7693,7 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter,
|
|||
pHostapdAdapter->dev);
|
||||
if (!CDF_IS_STATUS_SUCCESS(status)) {
|
||||
wlansap_reset_sap_config_add_ie(pConfig, eUPDATE_IE_ALL);
|
||||
cds_set_connection_in_progress(pHddCtx, false);
|
||||
cds_set_connection_in_progress(false);
|
||||
hddLog(LOGE, FL("SAP Start Bss fail"));
|
||||
return -EINVAL;
|
||||
}
|
||||
|
|
@ -7708,7 +7708,7 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter,
|
|||
if (!CDF_IS_STATUS_SUCCESS(status)) {
|
||||
hddLog(LOGE,
|
||||
FL("ERROR: HDD cdf wait for single_event failed!!"));
|
||||
cds_set_connection_in_progress(pHddCtx, false);
|
||||
cds_set_connection_in_progress(false);
|
||||
sme_get_command_q_status(hHal);
|
||||
#ifdef WLAN_FEATURE_MBSSID
|
||||
wlansap_stop_bss(WLAN_HDD_GET_SAP_CTX_PTR(pHostapdAdapter));
|
||||
|
|
@ -7722,7 +7722,7 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter,
|
|||
set_bit(SOFTAP_BSS_STARTED, &pHostapdAdapter->event_flags);
|
||||
/* Initialize WMM configuation */
|
||||
hdd_wmm_init(pHostapdAdapter);
|
||||
cds_incr_active_session(pHddCtx, pHostapdAdapter->device_mode,
|
||||
cds_incr_active_session(pHostapdAdapter->device_mode,
|
||||
pHostapdAdapter->sessionId);
|
||||
#ifdef DHCP_SERVER_OFFLOAD
|
||||
if (iniConfig->enableDHCPServerOffload)
|
||||
|
|
@ -7743,7 +7743,7 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter,
|
|||
}
|
||||
#endif
|
||||
|
||||
cds_set_connection_in_progress(pHddCtx, false);
|
||||
cds_set_connection_in_progress(false);
|
||||
pHostapdState->bCommit = true;
|
||||
EXIT();
|
||||
|
||||
|
|
@ -7883,7 +7883,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(pHddCtx,
|
||||
cds_decr_session_set_pcl(
|
||||
pAdapter->device_mode,
|
||||
pAdapter->sessionId);
|
||||
pAdapter->sessionCtx.ap.beacon = NULL;
|
||||
|
|
@ -8031,7 +8031,7 @@ static int __wlan_hdd_cfg80211_start_ap(struct wiphy *wiphy,
|
|||
params->chandef.chan->center_freq);
|
||||
|
||||
/* check if concurrency is allowed */
|
||||
if (!cds_allow_concurrency(pHddCtx,
|
||||
if (!cds_allow_concurrency(
|
||||
cds_convert_device_mode_to_hdd_type(
|
||||
pAdapter->device_mode),
|
||||
channel,
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2012-2015 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.
|
||||
*
|
||||
|
|
@ -4661,7 +4661,7 @@ static int drv_cmd_miracast(hdd_adapter_t *adapter,
|
|||
return -EBUSY;
|
||||
}
|
||||
|
||||
if (cds_is_mcc_in_24G(pHddCtx))
|
||||
if (cds_is_mcc_in_24G())
|
||||
return cds_set_mas(adapter, filterType);
|
||||
|
||||
exit:
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2012-2015 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.
|
||||
*
|
||||
|
|
@ -2405,7 +2405,7 @@ hdd_adapter_t *hdd_open_adapter(hdd_context_t *hdd_ctx, uint8_t session_type,
|
|||
}
|
||||
|
||||
if (CDF_STATUS_SUCCESS == status) {
|
||||
cds_set_concurrency_mode(hdd_ctx, session_type);
|
||||
cds_set_concurrency_mode(session_type);
|
||||
|
||||
/* Initialize the WoWL service */
|
||||
if (!hdd_init_wowl(adapter)) {
|
||||
|
|
@ -2420,7 +2420,7 @@ hdd_adapter_t *hdd_open_adapter(hdd_context_t *hdd_ctx, uint8_t session_type,
|
|||
hddLog(CDF_TRACE_LEVEL_DEBUG, FL("current_intf_count=%d"),
|
||||
hdd_ctx->current_intf_count);
|
||||
|
||||
cds_check_and_restart_sap_with_non_dfs_acs(hdd_ctx);
|
||||
cds_check_and_restart_sap_with_non_dfs_acs();
|
||||
}
|
||||
|
||||
if ((cds_get_conparam() != CDF_GLOBAL_FTM_MODE)
|
||||
|
|
@ -2588,7 +2588,7 @@ CDF_STATUS hdd_close_adapter(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter,
|
|||
}
|
||||
adapterNode = pCurrent;
|
||||
if (CDF_STATUS_SUCCESS == status) {
|
||||
cds_clear_concurrency_mode(hdd_ctx, adapter->device_mode);
|
||||
cds_clear_concurrency_mode(adapter->device_mode);
|
||||
hdd_cleanup_adapter(hdd_ctx, adapterNode->pAdapter, rtnl_held);
|
||||
|
||||
hdd_remove_adapter(hdd_ctx, adapterNode);
|
||||
|
|
@ -2787,7 +2787,7 @@ CDF_STATUS hdd_stop_adapter(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter,
|
|||
cds_flush_work(&hdd_ctx->sap_start_work);
|
||||
hddLog(CDF_TRACE_LEVEL_INFO_HIGH,
|
||||
FL("Canceled the pending SAP restart work"));
|
||||
cds_change_sap_restart_required_status(hdd_ctx, false);
|
||||
cds_change_sap_restart_required_status(false);
|
||||
}
|
||||
/* Any softap specific cleanup here... */
|
||||
if (adapter->device_mode == WLAN_HDD_P2P_GO)
|
||||
|
|
@ -2798,14 +2798,14 @@ CDF_STATUS hdd_stop_adapter(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter,
|
|||
mutex_lock(&hdd_ctx->sap_lock);
|
||||
if (test_bit(SOFTAP_BSS_STARTED, &adapter->event_flags)) {
|
||||
CDF_STATUS status;
|
||||
hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
|
||||
|
||||
/* Stop Bss. */
|
||||
#ifdef WLAN_FEATURE_MBSSID
|
||||
status = wlansap_stop_bss(
|
||||
WLAN_HDD_GET_SAP_CTX_PTR(adapter));
|
||||
#else
|
||||
status = wlansap_stop_bss(hdd_ctx->pcds_context);
|
||||
status = wlansap_stop_bss(
|
||||
(WLAN_HDD_GET_CTX(adapter))->pcds_context);
|
||||
#endif
|
||||
|
||||
if (CDF_IS_STATUS_SUCCESS(status)) {
|
||||
|
|
@ -2829,7 +2829,7 @@ CDF_STATUS hdd_stop_adapter(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter,
|
|||
hddLog(LOGE, FL("failure in wlansap_stop_bss"));
|
||||
}
|
||||
clear_bit(SOFTAP_BSS_STARTED, &adapter->event_flags);
|
||||
cds_decr_session_set_pcl(hdd_ctx,
|
||||
cds_decr_session_set_pcl(
|
||||
adapter->device_mode,
|
||||
adapter->sessionId);
|
||||
|
||||
|
|
@ -2920,7 +2920,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(hdd_ctx,
|
||||
cds_decr_session_set_pcl(
|
||||
adapter->device_mode,
|
||||
adapter->sessionId);
|
||||
if (test_bit(WMM_INIT_DONE, &adapter->event_flags)) {
|
||||
|
|
@ -4875,7 +4875,7 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc)
|
|||
hdd_ctx->isLogpInProgress = false;
|
||||
cds_set_logp_in_progress(false);
|
||||
|
||||
cds_set_connection_in_progress(hdd_ctx, false);
|
||||
cds_set_connection_in_progress(false);
|
||||
|
||||
hdd_wlan_green_ap_init(hdd_ctx);
|
||||
|
||||
|
|
@ -5294,7 +5294,7 @@ ftm_processing:
|
|||
#endif
|
||||
|
||||
wlan_hdd_nan_init(hdd_ctx);
|
||||
status = cds_init_policy_mgr(hdd_ctx);
|
||||
status = cds_init_policy_mgr();
|
||||
if (!CDF_IS_STATUS_SUCCESS(status)) {
|
||||
hdd_err("Policy manager initialization failed");
|
||||
goto err_nl_srv;
|
||||
|
|
@ -6252,7 +6252,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(hdd_ctx,
|
||||
cds_decr_session_set_pcl(
|
||||
ap_adapter->device_mode,
|
||||
ap_adapter->sessionId);
|
||||
hddLog(CDF_TRACE_LEVEL_INFO_HIGH,
|
||||
|
|
@ -6328,7 +6328,7 @@ void wlan_hdd_start_sap(hdd_adapter_t *ap_adapter)
|
|||
}
|
||||
hddLog(CDF_TRACE_LEVEL_INFO_HIGH, FL("SAP Start Success"));
|
||||
set_bit(SOFTAP_BSS_STARTED, &ap_adapter->event_flags);
|
||||
cds_incr_active_session(hdd_ctx, ap_adapter->device_mode,
|
||||
cds_incr_active_session(ap_adapter->device_mode,
|
||||
ap_adapter->sessionId);
|
||||
hostapd_state->bCommit = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2012-2015 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.
|
||||
*
|
||||
|
|
@ -845,8 +845,7 @@ static int wlan_hdd_request_remain_on_channel(struct wiphy *wiphy,
|
|||
ret = wlan_hdd_validate_context(pHddCtx);
|
||||
if (0 != ret)
|
||||
return ret;
|
||||
if (cds_is_connection_in_progress(
|
||||
(hdd_context_t *) pAdapter->pHddCtx)) {
|
||||
if (cds_is_connection_in_progress()) {
|
||||
hddLog(LOGE, FL("Connection is in progress"));
|
||||
isBusy = true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2012-2015 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.
|
||||
*
|
||||
|
|
@ -1337,7 +1337,7 @@ static int __wlan_hdd_cfg80211_scan(struct wiphy *wiphy,
|
|||
#endif
|
||||
|
||||
/* Check if scan is allowed at this point of time */
|
||||
if (cds_is_connection_in_progress(pHddCtx)) {
|
||||
if (cds_is_connection_in_progress()) {
|
||||
hddLog(LOGE, FL("Scan not allowed"));
|
||||
return -EBUSY;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2011-2015 The Linux Foundation. All rights reserved.
|
||||
* Copyright (c) 2011-2016 The Linux Foundation. All rights reserved.
|
||||
*
|
||||
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
|
||||
*
|
||||
|
|
@ -6875,7 +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(hdd_ctx,
|
||||
cds_set_dual_mac_scan_config(
|
||||
value[1], value[2],
|
||||
value[3]);
|
||||
break;
|
||||
|
|
@ -7693,7 +7693,7 @@ static int __iw_set_var_ints_getnone(struct net_device *dev,
|
|||
{
|
||||
hddLog(LOGE,
|
||||
FL("<iwpriv wlan0 pm_clist> is called\n"));
|
||||
cds_incr_connection_count_utfw(hdd_ctx, apps_args[0],
|
||||
cds_incr_connection_count_utfw(apps_args[0],
|
||||
apps_args[1], apps_args[2], apps_args[3],
|
||||
apps_args[4], apps_args[5], apps_args[6],
|
||||
apps_args[7]);
|
||||
|
|
@ -7704,7 +7704,7 @@ static int __iw_set_var_ints_getnone(struct net_device *dev,
|
|||
{
|
||||
hddLog(LOGE,
|
||||
FL("<iwpriv wlan0 pm_dlist> is called\n"));
|
||||
cds_decr_connection_count_utfw(hdd_ctx, apps_args[0],
|
||||
cds_decr_connection_count_utfw(apps_args[0],
|
||||
apps_args[1]);
|
||||
}
|
||||
break;
|
||||
|
|
@ -7713,7 +7713,7 @@ static int __iw_set_var_ints_getnone(struct net_device *dev,
|
|||
{
|
||||
hddLog(LOGE,
|
||||
FL("<iwpriv wlan0 pm_ulist> is called\n"));
|
||||
cds_update_connection_info_utfw(hdd_ctx, apps_args[0],
|
||||
cds_update_connection_info_utfw(apps_args[0],
|
||||
apps_args[1], apps_args[2], apps_args[3],
|
||||
apps_args[4], apps_args[5], apps_args[6],
|
||||
apps_args[7]);
|
||||
|
|
@ -7745,7 +7745,7 @@ static int __iw_set_var_ints_getnone(struct net_device *dev,
|
|||
hddLog(LOGE,
|
||||
FL("<iwpriv wlan0 pm_pcl> is called\n"));
|
||||
|
||||
cds_get_pcl(hdd_ctx, apps_args[0],
|
||||
cds_get_pcl(apps_args[0],
|
||||
pcl, &pcl_len);
|
||||
pr_info("PCL list for role[%d] is {", apps_args[0]);
|
||||
for (i = 0 ; i < pcl_len; i++)
|
||||
|
|
@ -7761,7 +7761,7 @@ static int __iw_set_var_ints_getnone(struct net_device *dev,
|
|||
|
||||
hddLog(LOGE,
|
||||
FL("<iwpriv wlan0 pm_cinfo> is called\n"));
|
||||
conn_info = cds_get_conn_info(hdd_ctx, &len);
|
||||
conn_info = cds_get_conn_info(&len);
|
||||
pr_info("+-----------------------------+\n");
|
||||
for (i = 0; i < len; i++) {
|
||||
pr_info("|table_index[%d]\t\t|\n", i);
|
||||
|
|
@ -7787,7 +7787,7 @@ static int __iw_set_var_ints_getnone(struct net_device *dev,
|
|||
if (apps_args[0] == 0) {
|
||||
hddLog(LOGE,
|
||||
FL("set hw mode for single mac\n"));
|
||||
cds_soc_set_hw_mode(hdd_ctx,
|
||||
cds_soc_set_hw_mode(
|
||||
pAdapter->sessionId,
|
||||
HW_MODE_SS_2x2,
|
||||
HW_MODE_80_MHZ,
|
||||
|
|
@ -7798,7 +7798,7 @@ static int __iw_set_var_ints_getnone(struct net_device *dev,
|
|||
} else if (apps_args[0] == 1) {
|
||||
hddLog(LOGE,
|
||||
FL("set hw mode for dual mac\n"));
|
||||
cds_soc_set_hw_mode(hdd_ctx,
|
||||
cds_soc_set_hw_mode(
|
||||
pAdapter->sessionId,
|
||||
HW_MODE_SS_1x1,
|
||||
HW_MODE_80_MHZ,
|
||||
|
|
@ -7826,7 +7826,7 @@ static int __iw_set_var_ints_getnone(struct net_device *dev,
|
|||
bool allow;
|
||||
hddLog(LOGE,
|
||||
FL("<iwpriv wlan0 pm_query_allow> is called\n"));
|
||||
allow = cds_allow_concurrency(hdd_ctx,
|
||||
allow = cds_allow_concurrency(
|
||||
apps_args[0], apps_args[1], apps_args[2]);
|
||||
pr_info("allow %d {0 = don't allow, 1 = allow}", allow);
|
||||
}
|
||||
|
|
@ -9513,7 +9513,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(hdd_ctx,
|
||||
cds_set_dual_mac_fw_mode_config(
|
||||
value[1], value[2]);
|
||||
break;
|
||||
case WE_DUMP_DP_TRACE_LEVEL:
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2011-2015 The Linux Foundation. All rights reserved.
|
||||
* Copyright (c) 2011-2016 The Linux Foundation. All rights reserved.
|
||||
*
|
||||
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
|
||||
*
|
||||
|
|
@ -1990,9 +1990,9 @@ csr_parse_scan_results(tpAniSirGlobal pMac,
|
|||
csr_ll_lock(&pMac->scan.scanResultList);
|
||||
|
||||
if (pFilter) {
|
||||
if (cds_map_concurrency_mode(pMac->hHdd,
|
||||
if (cds_map_concurrency_mode(
|
||||
&pFilter->csrPersona, &new_mode)) {
|
||||
status = cds_get_pcl(pMac->hHdd, new_mode,
|
||||
status = cds_get_pcl(new_mode,
|
||||
&pFilter->pcl_channels.channelList[0], &len);
|
||||
pFilter->pcl_channels.numChannels = (uint8_t)len;
|
||||
}
|
||||
|
|
@ -5485,7 +5485,7 @@ CDF_STATUS csr_scan_copy_request(tpAniSirGlobal mac_ctx,
|
|||
* out IBSS channel's band otherwise it will cause issue
|
||||
* in IBSS+STA concurrency
|
||||
*/
|
||||
if (true == cds_is_ibss_conn_exist(mac_ctx->hHdd, &ibss_channel)) {
|
||||
if (true == cds_is_ibss_conn_exist(&ibss_channel)) {
|
||||
sms_log(mac_ctx, LOG1,
|
||||
FL("Conc IBSS exist, channel list will be modified"));
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue