Merge "qcacld-3.0: Set ipa_pipes_down TRUE after IPA pipes are disabled" into wlan-cld3.driver.lnx.2.0-dev

This commit is contained in:
CNSS_WLAN Service 2017-10-24 12:03:14 -07:00 • committed by Gerrit - the friendly Code Review server
commit 04f5e1d1fb

View file

@ -5185,10 +5185,10 @@ static int __hdd_ipa_wlan_evt(struct hdd_adapter *adapter, uint8_t sta_id,
msg_ex->name);
} else {
/* Disable IPA UC TX PIPE when STA disconnected */
if (!hdd_ipa->num_iface &&
if ((1 == hdd_ipa->num_iface) &&
(HDD_IPA_UC_NUM_WDI_PIPE ==
hdd_ipa->activated_fw_pipe) &&
!hdd_ipa->ipa_pipes_down)
hdd_ipa->activated_fw_pipe) &&
!hdd_ipa->ipa_pipes_down)
hdd_ipa_uc_handle_last_discon(hdd_ipa);
}
@ -5220,10 +5220,9 @@ static int __hdd_ipa_wlan_evt(struct hdd_adapter *adapter, uint8_t sta_id,
return -EINVAL;
}
if ((!hdd_ipa->num_iface) &&
(HDD_IPA_UC_NUM_WDI_PIPE ==
hdd_ipa->activated_fw_pipe) &&
!hdd_ipa->ipa_pipes_down) {
if ((1 == hdd_ipa->num_iface) &&
(HDD_IPA_UC_NUM_WDI_PIPE == hdd_ipa->activated_fw_pipe) &&
!hdd_ipa->ipa_pipes_down) {
if (cds_is_driver_unloading()) {
/*
* We disable WDI pipes directly here since