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-13 08:07:32 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacld-3.0: Fix potential risk of AMSDU config

Browse source 
Change "qcacld-3.0: Add support to send A-MSDU aggregation type
to firmware" combines the AMSDU/AMPDU configuration path in WMA
layer, which is causing some ampdu parameters be overwritten by
value of amsdu.

Avoid GEN_VDEV_PARAM_AMSDU handler to touch ampdu parameters.

CRs-Fixed: 2243571
Change-Id: I52119f2bbcb306f5fad704e912c4cbb179c6a369
This commit is contained in:
Lin Bai 2018-05-17 11:50:01 +08:00 • committed by nshrivas
commit c135114bad
1 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

38
core/wma/src/wma_main.c
View file

@ -1182,7 +1182,12 @@ static void wma_process_cli_set_cmd(tp_wma_handle wma,
switch (privcmd->param_id) {
case GEN_VDEV_PARAM_AMSDU:
case GEN_VDEV_PARAM_AMPDU:
if (soc) {
if (!soc) {
WMA_LOGE("%s:SOC context is NULL", __func__);
return;
}
if (privcmd->param_id == GEN_VDEV_PARAM_AMPDU) {
ret = cdp_aggr_cfg(soc, vdev,
privcmd->param_value, 0);
if (ret)
@ -1191,26 +1196,21 @@ static void wma_process_cli_set_cmd(tp_wma_handle wma,
else
intr[privcmd->param_vdev_id].config.
ampdu = privcmd->param_value;
aggr.vdev_id = vid;
aggr.tx_aggregation_size =
privcmd->param_value;
aggr.rx_aggregation_size =
privcmd->param_value;
if (privcmd->param_id == GEN_VDEV_PARAM_AMSDU)
aggr.aggr_type =
WMI_VDEV_CUSTOM_AGGR_TYPE_AMSDU;
else
aggr.aggr_type =
WMI_VDEV_CUSTOM_AGGR_TYPE_AMPDU;
ret = wma_set_tx_rx_aggregation_size(&aggr);
if (QDF_IS_STATUS_ERROR(ret)) {
WMA_LOGE("set_aggr_size failed ret %d",
ret);
return;
}
aggr.aggr_type =
WMI_VDEV_CUSTOM_AGGR_TYPE_AMPDU;
} else {
WMA_LOGE("%s:SOC context is NULL", __func__);
aggr.aggr_type =
WMI_VDEV_CUSTOM_AGGR_TYPE_AMSDU;
}
aggr.vdev_id = vid;
aggr.tx_aggregation_size = privcmd->param_value;
aggr.rx_aggregation_size = privcmd->param_value;
ret = wma_set_tx_rx_aggregation_size(&aggr);
if (QDF_IS_STATUS_ERROR(ret)) {
WMA_LOGE("set_aggr_size failed ret %d", ret);
return;
}
break;