Merge branch 'android-msm-bluecross-4.9-pi-qpr1' into android-msm-bluecross-4.9-pi-qpr2
JULY 2019.3
Bug: 131239907
Change-Id: Iee30975dc5eceececdedcd5761b1245cf64e316b
Signed-off-by: Kelly Rossmoyer <krossmo@google.com>
diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c
index 9d32fbb..173d711 100644
--- a/core/hdd/src/wlan_hdd_hostapd.c
+++ b/core/hdd/src/wlan_hdd_hostapd.c
@@ -2257,16 +2257,21 @@
&pSapEvent->sapevt.sapStationDisassocCompleteEvent;
memcpy(wrqu.addr.sa_data,
&disassoc_comp->staMac, QDF_MAC_ADDR_SIZE);
- hdd_notice(" disassociated " MAC_ADDRESS_STR,
- MAC_ADDR_ARRAY(wrqu.addr.sa_data));
+
stainfo = hdd_get_stainfo(pHostapdAdapter->cache_sta_info,
disassoc_comp->staMac);
- if (stainfo) {
- stainfo->rssi = disassoc_comp->rssi;
- stainfo->tx_rate = disassoc_comp->tx_rate;
- stainfo->rx_rate = disassoc_comp->rx_rate;
- stainfo->reason_code = disassoc_comp->reason_code;
+ if (!stainfo) {
+ hdd_err("peer " MAC_ADDRESS_STR " not found",
+ MAC_ADDR_ARRAY(wrqu.addr.sa_data));
+ return -EINVAL;
}
+ hdd_notice(" disassociated " MAC_ADDRESS_STR,
+ MAC_ADDR_ARRAY(wrqu.addr.sa_data));
+
+ stainfo->rssi = disassoc_comp->rssi;
+ stainfo->tx_rate = disassoc_comp->tx_rate;
+ stainfo->rx_rate = disassoc_comp->rx_rate;
+ stainfo->reason_code = disassoc_comp->reason_code;
qdf_status = qdf_event_set(&pHostapdState->qdf_sta_disassoc_event);
if (!QDF_IS_STATUS_SUCCESS(qdf_status))
