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-24 21:54:34 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacld-3.0: Deprecate enum sir_conn_update_reason

Browse source 
Deprecate enum sir_conn_update_reason & use enum
policy_mgr_conn_update_reason from policy manager component.

Change-Id: Id592d5405235f29a962a2a7d8b679fa4363f556d
CRs-Fixed: 2213000
This commit is contained in:
Tushnim Bhattacharyya 2018-03-26 14:19:24 -07:00 • committed by nshrivas
commit 3b99f4b181
8 changed files with 16 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

10
core/hdd/src/wlan_hdd_cfg80211.c
View file

@ -10280,10 +10280,10 @@ int wlan_hdd_request_pre_cac(uint8_t channel)
* connection update should result in DBS mode
*/
status = policy_mgr_update_and_wait_for_connection_update(
hdd_ctx->hdd_psoc,
ap_adapter->session_id,
pre_cac_chan,
SIR_UPDATE_REASON_PRE_CAC);
hdd_ctx->hdd_psoc,
ap_adapter->session_id,
pre_cac_chan,
POLICY_MGR_UPDATE_REASON_PRE_CAC);
if (QDF_IS_STATUS_ERROR(status)) {
hdd_err("error in moving to DBS mode");
goto stop_close_pre_cac_adapter;
@ -20025,7 +20025,7 @@ static int __wlan_hdd_cfg80211_join_ibss(struct wiphy *wiphy,
status = policy_mgr_current_connections_update(hdd_ctx->hdd_psoc,
adapter->session_id, channelNum,
SIR_UPDATE_REASON_JOIN_IBSS);
POLICY_MGR_UPDATE_REASON_JOIN_IBSS);
if (QDF_STATUS_E_FAILURE == status) {
hdd_err("connections update failed!!");
return -EINVAL;

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

@ -8653,7 +8653,7 @@ static int __wlan_hdd_cfg80211_start_ap(struct wiphy *wiphy,
status = policy_mgr_current_connections_update(hdd_ctx->hdd_psoc,
adapter->session_id, channel,
SIR_UPDATE_REASON_START_AP);
POLICY_MGR_UPDATE_REASON_START_AP);
if (QDF_STATUS_E_FAILURE == status) {
hdd_err("ERROR: connections update failed!!");
return -EINVAL;

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

@ -8120,7 +8120,7 @@ static int iw_get_policy_manager_ut_ops(struct hdd_context *hdd_ctx,
HW_MODE_DBS_NONE,
HW_MODE_AGILE_DFS_NONE,
HW_MODE_SBS_NONE,
SIR_UPDATE_REASON_UT, PM_NOP);
POLICY_MGR_UPDATE_REASON_UT, PM_NOP);
} else if (apps_args[0] == 1) {
hdd_err("set hw mode for dual mac");
policy_mgr_pdev_set_hw_mode(hdd_ctx->hdd_psoc,
@ -8131,7 +8131,7 @@ static int iw_get_policy_manager_ut_ops(struct hdd_context *hdd_ctx,
HW_MODE_DBS,
HW_MODE_AGILE_DFS_NONE,
HW_MODE_SBS_NONE,
SIR_UPDATE_REASON_UT, PM_NOP);
POLICY_MGR_UPDATE_REASON_UT, PM_NOP);
}
}
break;
@ -8144,7 +8144,7 @@ static int iw_get_policy_manager_ut_ops(struct hdd_context *hdd_ctx,
action = policy_mgr_current_connections_update(
hdd_ctx->hdd_psoc,
adapter->session_id, apps_args[0],
SIR_UPDATE_REASON_UT);
POLICY_MGR_UPDATE_REASON_UT);
pr_info("next action is %d {HDD_NOP = 0, HDD_DBS, HDD_DBS_DOWNGRADE, HDD_MCC, HDD_MCC_UPGRADE}", action);
}
break;

27
core/mac/inc/sir_api.h
View file

@ -131,33 +131,6 @@ typedef uint8_t tSirVersionString[SIR_VERSION_STRING_LEN];
/* Maximum number of peers for SAP */
#define SIR_SAP_MAX_NUM_PEERS 32
/**
* enum sir_conn_update_reason: Reason for conc connection update
* @SIR_UPDATE_REASON_SET_OPER_CHAN: Set probable operating channel
* @SIR_UPDATE_REASON_JOIN_IBSS: Join IBSS
* @SIR_UPDATE_REASON_UT: Unit test related
* @SIR_UPDATE_REASON_START_AP: Start AP
* @SIR_UPDATE_REASON_NORMAL_STA: Connection to Normal STA
* @SIR_UPDATE_REASON_HIDDEN_STA: Connection to Hidden STA
* @SIR_UPDATE_REASON_OPPORTUNISTIC: Opportunistic HW mode update
* @SIR_UPDATE_REASON_NSS_UPDATE: NSS update
* @SIR_UPDATE_REASON_CHANNEL_SWITCH: Channel switch
* @SIR_UPDATE_REASON_CHANNEL_SWITCH_STA: Channel switch for STA
*/
enum sir_conn_update_reason {
SIR_UPDATE_REASON_SET_OPER_CHAN,
SIR_UPDATE_REASON_JOIN_IBSS,
SIR_UPDATE_REASON_UT,
SIR_UPDATE_REASON_START_AP,
SIR_UPDATE_REASON_NORMAL_STA,
SIR_UPDATE_REASON_HIDDEN_STA,
SIR_UPDATE_REASON_OPPORTUNISTIC,
SIR_UPDATE_REASON_NSS_UPDATE,
SIR_UPDATE_REASON_CHANNEL_SWITCH,
SIR_UPDATE_REASON_CHANNEL_SWITCH_STA,
SIR_UPDATE_REASON_PRE_CAC,
};
typedef enum {
eSIR_EXTSCAN_INVALID,
eSIR_EXTSCAN_START_RSP,

2
core/sap/src/sap_fsm.c
View file

@ -1098,7 +1098,7 @@ QDF_STATUS sap_goto_channel_sel(struct sap_context *sap_context,
mac_ctx->psoc,
sap_context->sessionId,
sap_context->channel,
SIR_UPDATE_REASON_START_AP);
POLICY_MGR_UPDATE_REASON_START_AP);
if (QDF_IS_STATUS_ERROR(qdf_status))
return qdf_status;
}

4
core/sme/inc/sme_inside.h
View file

@ -154,6 +154,8 @@ typedef struct s_tdls_cmd {
* @session_id: Session ID
* @set_hw_mode_cb: HDD nss update callback
* @context: Adapter context
* @next_action: Action to be taken after nss update
* @reason: reason for nss update
*/
struct s_nss_update_cmd {
uint32_t new_nss;
@ -161,7 +163,7 @@ struct s_nss_update_cmd {
void *nss_update_cb;
void *context;
uint8_t next_action;
enum sir_conn_update_reason reason;
enum policy_mgr_conn_update_reason reason;
};
typedef struct tagSmeCmd {

4
core/sme/src/common/sme_api.c
View file

@ -154,7 +154,7 @@ static QDF_STATUS sme_process_set_hw_mode_resp(tpAniSirGlobal mac, uint8_t *msg)
bool found;
policy_mgr_pdev_set_hw_mode_cback callback = NULL;
struct sir_set_hw_mode_resp *param;
enum sir_conn_update_reason reason;
enum policy_mgr_conn_update_reason reason;
struct csr_roam_session *session;
uint32_t session_id;
@ -219,7 +219,7 @@ static QDF_STATUS sme_process_set_hw_mode_resp(tpAniSirGlobal mac, uint8_t *msg)
goto end;
}
session = CSR_GET_SESSION(mac, session_id);
if (reason == SIR_UPDATE_REASON_HIDDEN_STA) {
if (reason == POLICY_MGR_UPDATE_REASON_HIDDEN_STA) {
/* In the case of hidden SSID, connection update
* (set hw mode) is done after the scan with reason
* code eCsrScanForSsid completes. The connect/failure

2
core/sme/src/csr/csr_api_scan.c
View file

@ -2061,7 +2061,7 @@ static void csr_handle_nxt_cmd(tpAniSirGlobal mac_ctx,
case eCsrNextCheckAllowConc:
ret = policy_mgr_current_connections_update(mac_ctx->psoc,
session_id, chan,
SIR_UPDATE_REASON_HIDDEN_STA);
POLICY_MGR_UPDATE_REASON_HIDDEN_STA);
sme_debug("chan: %d session: %d status: %d",
chan, session_id, ret);