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 16:16:15 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacld-3.0: Correctly call wlansap_cancel_remain_on_channel()

Browse source 
Over time the wlansap() APIs changed from being passed the global
context to being passed the SAP context. Apparently two invocations of
wlansap_cancel_remain_on_channel() were not correctly updated, so
update them.

Change-Id: I53c54c639ed2695439e4f5cf506e7f23732ab8de
CRs-Fixed: 2109408
This commit is contained in:
Jeff Johnson 2017-09-13 16:14:34 -07:00
commit ec685dbcda
1 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

22
core/hdd/src/wlan_hdd_p2p.c
View file

@ -450,11 +450,11 @@ static void wlan_hdd_cancel_pending_roc(struct hdd_adapter *adapter)
mutex_unlock(&cfg_state->remain_on_chan_ctx_lock);
if (adapter->device_mode == QDF_P2P_GO_MODE) {
wlansap_cancel_remain_on_channel((WLAN_HDD_GET_CTX
(adapter))->pcds_context, roc_scan_id);
} else if (adapter->device_mode == QDF_P2P_CLIENT_MODE
|| adapter->device_mode ==
QDF_P2P_DEVICE_MODE) {
void *sap_ctx = WLAN_HDD_GET_SAP_CTX_PTR(adapter);
wlansap_cancel_remain_on_channel(sap_ctx, roc_scan_id);
} else if (adapter->device_mode == QDF_P2P_CLIENT_MODE ||
adapter->device_mode == QDF_P2P_DEVICE_MODE) {
sme_cancel_remain_on_channel(WLAN_HDD_GET_HAL_CTX
(adapter),
adapter->sessionId, roc_scan_id);
@ -570,16 +570,14 @@ static void wlan_hdd_remain_on_chan_timeout(void *data)
if ((QDF_STA_MODE == pAdapter->device_mode) ||
(QDF_P2P_CLIENT_MODE == pAdapter->device_mode) ||
(QDF_P2P_DEVICE_MODE == pAdapter->device_mode)
) {
(QDF_P2P_DEVICE_MODE == pAdapter->device_mode)) {
sme_cancel_remain_on_channel(WLAN_HDD_GET_HAL_CTX(pAdapter),
pAdapter->sessionId, roc_scan_id);
} else if ((QDF_SAP_MODE == pAdapter->device_mode) ||
(QDF_P2P_GO_MODE == pAdapter->device_mode)
) {
wlansap_cancel_remain_on_channel(
(WLAN_HDD_GET_CTX(pAdapter))->pcds_context,
roc_scan_id);
(QDF_P2P_GO_MODE == pAdapter->device_mode)) {
void *sap_ctx = WLAN_HDD_GET_SAP_CTX_PTR(pAdapter);
wlansap_cancel_remain_on_channel(sap_ctx, roc_scan_id);
}
hdd_tdls_notify_p2p_roc(hdd_ctx, P2P_ROC_END);