samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacmn: Clear legacy channel ID usage

Browse Source 
1) Remove the definition of plm_ch_list from
   struct plm_req_params and add plm_ch_freq_list
   into the same struct given frequencies will be
   used directly before passing WMI command to
   firmware.

2) Remove redundant channel frequency list from the
   following API functions' parameters:

   send_plm_start_cmd
   wmi_unified_plm_start_cmd
   send_plm_start_cmd_tlv

Change-Id: I982412076b422356037d9bbfa2077affd1056189
CRs-Fixed: 2560085
This commit is contained in:
wadesong
2019-11-04 15:18:35 +08:00
committed by nshrivas
parent 6f59c89126
commit c3ac05e67f
5 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
wmi/inc/wmi_unified_priv.h
View File

@@ -617,8 +617,7 @@ QDF_STATUS (*send_plm_stop_cmd)(wmi_unified_t wmi_handle,
const struct plm_req_params *plm); const struct plm_req_params *plm);
QDF_STATUS (*send_plm_start_cmd)(wmi_unified_t wmi_handle, QDF_STATUS (*send_plm_start_cmd)(wmi_unified_t wmi_handle,
const struct plm_req_params *plm, const struct plm_req_params *plm);
uint32_t *gchannel_list);
#endif /* FEATURE_WLAN_ESE */ #endif /* FEATURE_WLAN_ESE */
#ifdef WLAN_FEATURE_ROAM_OFFLOAD #ifdef WLAN_FEATURE_ROAM_OFFLOAD

4
wmi/inc/wmi_unified_roam_api.h
View File

@@ -119,15 +119,13 @@ QDF_STATUS wmi_unified_plm_stop_cmd(wmi_unified_t wmi_handle,
* wmi_unified_plm_start_cmd() - plm start request * wmi_unified_plm_start_cmd() - plm start request
* @wmi_handle: wmi handle * @wmi_handle: wmi handle
* @plm: plm request parameters * @plm: plm request parameters
* @gchannel_list: gchannel list
* *
* This function request FW to start PLM. * This function request FW to start PLM.
* *
* Return: QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failure * Return: QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failure
*/ */
QDF_STATUS wmi_unified_plm_start_cmd(wmi_unified_t wmi_handle, QDF_STATUS wmi_unified_plm_start_cmd(wmi_unified_t wmi_handle,
const struct plm_req_params *plm, const struct plm_req_params *plm);
uint32_t *gchannel_list);
#endif /* FEATURE_WLAN_ESE */ #endif /* FEATURE_WLAN_ESE */
#ifdef WLAN_FEATURE_ROAM_OFFLOAD #ifdef WLAN_FEATURE_ROAM_OFFLOAD

6
wmi/inc/wmi_unified_roam_param.h
View File

@@ -245,7 +245,7 @@ struct roam_scan_filter_params {
* @desired_tx_pwr: desired tx power * @desired_tx_pwr: desired tx power
* @mac_addr: MC dest addr * @mac_addr: MC dest addr
* @plm_num_ch: channel numbers * @plm_num_ch: channel numbers
* @plm_ch_list: channel list * @plm_ch_freq_list: channel frequency list
* @vdev_id: vdev id * @vdev_id: vdev id
* @enable: enable/disable * @enable: enable/disable
*/ */
@@ -261,8 +261,8 @@ struct plm_req_params {
struct qdf_mac_addr mac_addr; struct qdf_mac_addr mac_addr;
/* no of channels */ /* no of channels */
uint8_t plm_num_ch; uint8_t plm_num_ch;
/* channel numbers */ /* channel frequency list */
uint8_t plm_ch_list[WMI_CFG_VALID_CHANNEL_LIST_LEN]; uint32_t plm_ch_freq_list[WMI_CFG_VALID_CHANNEL_LIST_LEN];
uint8_t vdev_id; uint8_t vdev_id;
bool enable; bool enable;
}; };

7
wmi/src/wmi_unified_roam_api.c
View File

@@ -93,13 +93,10 @@ QDF_STATUS wmi_unified_plm_stop_cmd(wmi_unified_t wmi_handle,
} }
QDF_STATUS wmi_unified_plm_start_cmd(wmi_unified_t wmi_handle, QDF_STATUS wmi_unified_plm_start_cmd(wmi_unified_t wmi_handle,
const struct plm_req_params *plm, const struct plm_req_params *plm)
uint32_t *gchannel_list)
{ {
if (wmi_handle->ops->send_plm_start_cmd) if (wmi_handle->ops->send_plm_start_cmd)
return wmi_handle->ops->send_plm_start_cmd(wmi_handle, return wmi_handle->ops->send_plm_start_cmd(wmi_handle, plm);
plm,
gchannel_list);
return QDF_STATUS_E_FAILURE; return QDF_STATUS_E_FAILURE;
} }

8
wmi/src/wmi_unified_roam_tlv.c
View File

@@ -592,8 +592,7 @@ static QDF_STATUS send_plm_stop_cmd_tlv(wmi_unified_t wmi_handle,
* Return: CDF status * Return: CDF status
*/ */
static QDF_STATUS send_plm_start_cmd_tlv(wmi_unified_t wmi_handle, static QDF_STATUS send_plm_start_cmd_tlv(wmi_unified_t wmi_handle,
const struct plm_req_params *plm, const struct plm_req_params *plm)
uint32_t *gchannel_list)
{ {
wmi_vdev_plmreq_start_cmd_fixed_param *cmd; wmi_vdev_plmreq_start_cmd_fixed_param *cmd;
uint32_t *channel_list; uint32_t *channel_list;
@@ -650,10 +649,7 @@ static QDF_STATUS send_plm_start_cmd_tlv(wmi_unified_t wmi_handle,
if (cmd->num_chans) { if (cmd->num_chans) {
channel_list = (uint32_t *) buf_ptr; channel_list = (uint32_t *) buf_ptr;
for (count = 0; count < cmd->num_chans; count++) { for (count = 0; count < cmd->num_chans; count++) {
channel_list[count] = plm->plm_ch_list[count]; channel_list[count] = plm->plm_ch_freq_list[count];
if (channel_list[count] < WMI_NLO_FREQ_THRESH)
channel_list[count] =
gchannel_list[count];
WMI_LOGD("Ch[%d]: %d MHz", count, channel_list[count]); WMI_LOGD("Ch[%d]: %d MHz", count, channel_list[count]);
} }
buf_ptr += cmd->num_chans * sizeof(uint32_t); buf_ptr += cmd->num_chans * sizeof(uint32_t);