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

qcacmn: Fix OPPS set failed on p2p GO

Browse Source 
Find the correct P2P GO vdev and update
the vdev_id to ps_config before set opps
parameter to Firmware.

Change-Id: Ie5435de8330f6e9c13f645e19d80cbd97f1f027d
CRs-Fixed: 2203066
This commit is contained in:
Liangwei Dong
2018-03-23 05:25:12 -04:00
committed by nshrivas
parent 65817ac2d7
commit b17e0bce59
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
umac/p2p/dispatcher/src/wlan_p2p_ucfg_api.c
View File

@@ -325,6 +325,7 @@ QDF_STATUS ucfg_p2p_set_ps(struct wlan_objmgr_psoc *soc,
QDF_STATUS status = QDF_STATUS_E_FAILURE; QDF_STATUS status = QDF_STATUS_E_FAILURE;
uint16_t obj_id; uint16_t obj_id;
struct wlan_objmgr_vdev *vdev; struct wlan_objmgr_vdev *vdev;
struct p2p_ps_config go_ps_config;
p2p_debug("soc:%pK, vdev_id:%d, opp_ps:%d, ct_window:%d, count:%d, duration:%d, duration:%d, ps_selection:%d", p2p_debug("soc:%pK, vdev_id:%d, opp_ps:%d, ct_window:%d, count:%d, duration:%d, duration:%d, ps_selection:%d",
soc, ps_config->vdev_id, ps_config->opp_ps, soc, ps_config->vdev_id, ps_config->opp_ps,
@@ -342,19 +343,26 @@ QDF_STATUS ucfg_p2p_set_ps(struct wlan_objmgr_psoc *soc,
vdev = wlan_objmgr_get_vdev_by_id_from_psoc(soc, obj_id, vdev = wlan_objmgr_get_vdev_by_id_from_psoc(soc, obj_id,
WLAN_P2P_ID); WLAN_P2P_ID);
if (vdev) { if (vdev) {
if (is_p2p_ps_allowed(vdev, if (is_p2p_ps_allowed(vdev, WLAN_UMAC_COMP_P2P)) {
WLAN_UMAC_COMP_P2P) == false) { wlan_objmgr_vdev_release_ref(vdev, WLAN_P2P_ID);
p2p_debug("p2p set ps, NoA is disabled as legacy STA is connected to GO."); break;
return QDF_STATUS_E_BUSY;
} }
wlan_objmgr_vdev_release_ref(vdev, WLAN_P2P_ID); wlan_objmgr_vdev_release_ref(vdev, WLAN_P2P_ID);
p2p_debug("skip p2p set ps vdev %d, NoA is disabled as legacy STA is connected to GO.",
obj_id);
} }
} }
if (obj_id >= WLAN_UMAC_PSOC_MAX_VDEVS) {
p2p_debug("No GO found!");
return QDF_STATUS_E_INVAL;
}
go_ps_config = *ps_config;
go_ps_config.vdev_id = obj_id;
p2p_ops = ucfg_p2p_psoc_get_tx_ops(soc); p2p_ops = ucfg_p2p_psoc_get_tx_ops(soc);
if (p2p_ops->set_ps) { if (p2p_ops->set_ps) {
status = p2p_ops->set_ps(soc, ps_config); status = p2p_ops->set_ps(soc, &go_ps_config);
p2p_debug("p2p set ps, status:%d", status); p2p_debug("p2p set ps vdev %d, status:%d", obj_id, status);
} }
return status; return status;