diff options
| author | CNSS_WLAN Service <cnssbldsw@qualcomm.com> | 2017-11-08 14:40:21 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-11-08 14:40:21 -0800 |
| commit | 7b2cc608309df57bfc901b65ea603a690e933d67 (patch) | |
| tree | e6d242b9298d246487e5ccf7edd2a5ce1f09f933 | |
| parent | 73309367e690c058e19ae0880ff5f6409952ede0 (diff) | |
| parent | 2c83df235dae81e177f8aff90964cdef07e3cd5b (diff) | |
Merge "qcacld-3.0: Fix sap_num_connected_sta leak" into wlan-cld3.driver.lnx.1.1
| -rw-r--r-- | core/hdd/src/wlan_hdd_hostapd.c | 13 | ||||
| -rw-r--r-- | core/hdd/src/wlan_hdd_softap_tx_rx.c | 7 |
2 files changed, 7 insertions, 13 deletions
diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c index 8eb7498cc8e1..bf1583151a12 100644 --- a/core/hdd/src/wlan_hdd_hostapd.c +++ b/core/hdd/src/wlan_hdd_hostapd.c @@ -2203,20 +2203,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, hdd_err("Failed to find sta id status: %d", qdf_status); return QDF_STATUS_E_FAILURE; } -#ifdef IPA_OFFLOAD - if (hdd_ipa_is_enabled(pHddCtx)) { - status = hdd_ipa_wlan_evt(pHostapdAdapter, staId, - HDD_IPA_CLIENT_DISCONNECT, - pSapEvent->sapevt. - sapStationDisassocCompleteEvent. - staMac.bytes); - if (status) { - hdd_err("WLAN_CLIENT_DISCONNECT event failed"); - goto stopbss; - } - } -#endif DPTRACE(qdf_dp_trace_mgmt_pkt(QDF_DP_TRACE_MGMT_PACKET_RECORD, pHostapdAdapter->sessionId, QDF_PROTO_TYPE_MGMT, QDF_PROTO_MGMT_DISASSOC)); diff --git a/core/hdd/src/wlan_hdd_softap_tx_rx.c b/core/hdd/src/wlan_hdd_softap_tx_rx.c index 4ed62dc0b8f0..7888cb828ad8 100644 --- a/core/hdd/src/wlan_hdd_softap_tx_rx.c +++ b/core/hdd/src/wlan_hdd_softap_tx_rx.c @@ -829,6 +829,13 @@ QDF_STATUS hdd_softap_deregister_sta(hdd_adapter_t *pAdapter, uint8_t staId) staId, qdf_status, qdf_status); if (pAdapter->aStaInfo[staId].isUsed) { + if (hdd_ipa_uc_is_enabled(pHddCtx)) { + hdd_ipa_wlan_evt(pAdapter, + pAdapter->aStaInfo[staId].ucSTAId, + HDD_IPA_CLIENT_DISCONNECT, + pAdapter->aStaInfo[staId].macAddrSTA. + bytes); + } spin_lock_bh(&pAdapter->staInfo_lock); qdf_mem_zero(&pAdapter->aStaInfo[staId], sizeof(hdd_station_info_t)); |