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

qcacmn: Remove unused and duplicate members from vdev_start_params

Browse Source 
Remove the unused fields from WMI unified vdev_start_params structure.
The channel information duplicated in vdev_start_params and
it sub structure channel is removed and all implementations
can use the channel sub structure directly.

Change-Id: I47cf4c4223111b6f564ec8336dbfcda4592e8e0c
CRs-Fixed: 2350505
This commit is contained in:
Vivek
2018-11-15 16:22:22 +05:30
committed by nshrivas
parent fba89964c1
commit 0844327b5e
3 changed files with 17 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
wmi/src/wmi_unified_ocb_ut.c
View File

@@ -403,10 +403,11 @@ static QDF_STATUS fake_vdev_start_cmd_tlv(wmi_unified_t wmi_handle,
"beacon interval %d dtim %d center_chan %d center_freq2 %d "
"max_txpow: 0x%x "
"Tx SS %d, Rx SS %d, ldpc_rx: %d, cac %d, regd %d, HE ops: %d",
__func__, (int)req->vdev_id, req->chan_freq, req->chan_mode,
(int)req->is_dfs, req->beacon_intval, req->dtim_period,
req->band_center_freq1, req->band_center_freq2,
req->max_txpow,
__func__, (int)req->vdev_id, req->channel.mhz,
req->channel.phy_mode,
(int)req->channel.dfs_set, req->beacon_intval, req->dtim_period,
req->channel.cfreq1, req->channel.cfreq2,
req->channel.maxregpower,
req->preferred_tx_streams, req->preferred_rx_streams,
(int)req->ldpc_rx_enabled, req->cac_duration_ms,
req->regdomain, req->he_ops);

41
wmi/src/wmi_unified_tlv.c
View File

@@ -409,34 +409,6 @@ static QDF_STATUS send_vdev_down_cmd_tlv(wmi_unified_t wmi, uint8_t vdev_id)
return 0;
}
#ifdef CONFIG_MCL
static inline void copy_channel_info(
wmi_vdev_start_request_cmd_fixed_param * cmd,
wmi_channel *chan,
struct vdev_start_params *req)
{
chan->mhz = req->chan_freq;
WMI_SET_CHANNEL_MODE(chan, req->chan_mode);
chan->band_center_freq1 = req->band_center_freq1;
chan->band_center_freq2 = req->band_center_freq2;
if (req->is_half_rate)
WMI_SET_CHANNEL_FLAG(chan, WMI_CHAN_FLAG_HALF_RATE);
else if (req->is_quarter_rate)
WMI_SET_CHANNEL_FLAG(chan, WMI_CHAN_FLAG_QUARTER_RATE);
if (req->is_dfs && req->flag_dfs) {
WMI_SET_CHANNEL_FLAG(chan, req->flag_dfs);
cmd->disable_hw_ack = req->dis_hw_ack;
}
WMI_SET_CHANNEL_REG_POWER(chan, req->max_txpow);
WMI_SET_CHANNEL_MAX_TX_POWER(chan, req->max_txpow);
}
#else
static inline void copy_channel_info(
wmi_vdev_start_request_cmd_fixed_param * cmd,
wmi_channel *chan,
@@ -448,15 +420,12 @@ static inline void copy_channel_info(
chan->band_center_freq1 = req->channel.cfreq1;
chan->band_center_freq2 = req->channel.cfreq2;
WMI_LOGI("%s: req->channel.phy_mode: %d ", req->channel.phy_mode);
if (req->channel.half_rate)
WMI_SET_CHANNEL_FLAG(chan, WMI_CHAN_FLAG_HALF_RATE);
else if (req->channel.quarter_rate)
WMI_SET_CHANNEL_FLAG(chan, WMI_CHAN_FLAG_QUARTER_RATE);
WMI_LOGI("%s: req->channel.dfs_set: %d ", req->channel.dfs_set);
if (req->channel.dfs_set) {
WMI_SET_CHANNEL_FLAG(chan, WMI_CHAN_FLAG_DFS);
cmd->disable_hw_ack = req->disable_hw_ack;
@@ -477,7 +446,7 @@ static inline void copy_channel_info(
WMI_SET_CHANNEL_MAX_TX_POWER(chan, req->channel.maxregpower);
}
#endif
/**
* send_vdev_start_cmd_tlv() - send vdev start request to fw
* @wmi_handle: wmi handle
@@ -560,14 +529,14 @@ static QDF_STATUS send_vdev_start_cmd_tlv(wmi_unified_t wmi_handle,
"reg_info_1: 0x%x reg_info_2: 0x%x, req->max_txpow: 0x%x "
"Tx SS %d, Rx SS %d, ldpc_rx: %d, cac %d, regd %d, HE ops: %d"
"req->dis_hw_ack: %d ", __func__, req->vdev_id,
chan->mhz, req->chan_mode, chan->info,
req->is_dfs, req->beacon_intval, cmd->dtim_period,
chan->mhz, req->channel.phy_mode, chan->info,
req->channel.dfs_set, req->beacon_intval, cmd->dtim_period,
chan->band_center_freq1, chan->band_center_freq2,
chan->reg_info_1, chan->reg_info_2, req->max_txpow,
chan->reg_info_1, chan->reg_info_2, req->channel.maxregpower,
req->preferred_tx_streams, req->preferred_rx_streams,
req->ldpc_rx_enabled, req->cac_duration_ms,
req->regdomain, req->he_ops,
req->dis_hw_ack);
req->disable_hw_ack);
if (req->is_restart) {
wmi_mtrace(WMI_VDEV_RESTART_REQUEST_CMDID, cmd->vdev_id, 0);