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 08:07:32 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacld-3.0: Cleanup interface when loading/unloading timeout

Browse source 
When AP_DISCONNECT event occurs during IPA resource unloading in
progress, timeout could happen since suspending FW IPA Rx pipe took much
time. This could cause a subsequent AP_CONNECT event failed since no
interface is available.
Fix this by
- Adapter struct sanity check using hdd_validate_adapter()
- Call hdd_ipa_cleanup_iface() for AP_DISCONNECT/STA_DISCONNECT event
  in loading/unloading timeout case
- Assert when no interface is available in hdd_ipa_setup_iface()

Change-Id: Ie96e4f0e96ccffacf4ce5fcc976636c440214873
CRs-Fixed: 2208347
This commit is contained in:
Yun Park 2018-04-24 12:11:01 -07:00 • committed by nshrivas
commit 21ec490dbd
2 changed files with 22 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

21
components/ipa/core/src/wlan_ipa_core.c
View file

@ -1070,6 +1070,13 @@ static QDF_STATUS wlan_ipa_setup_iface(struct wlan_ipa_priv *ipa_ctx,
}
}
if (WLAN_IPA_MAX_IFACE == ipa_ctx->num_iface) {
ipa_err("Max interface reached %d", WLAN_IPA_MAX_IFACE);
status = QDF_STATUS_E_NOMEM;
QDF_ASSERT(0);
goto end;
}
for (i = 0; i < WLAN_IPA_MAX_IFACE; i++) {
if (ipa_ctx->iface_context[i].tl_context == NULL) {
iface_context = &(ipa_ctx->iface_context[i]);
@ -1080,6 +1087,7 @@ static QDF_STATUS wlan_ipa_setup_iface(struct wlan_ipa_priv *ipa_ctx,
if (iface_context == NULL) {
ipa_err("All the IPA interfaces are in use");
status = QDF_STATUS_E_NOMEM;
QDF_ASSERT(0);
goto end;
}
@ -1338,6 +1346,19 @@ static QDF_STATUS __wlan_ipa_wlan_evt(qdf_netdev_t net_dev, uint8_t device_mode,
qdf_mutex_release(&ipa_ctx->ipa_lock);
/* Cleanup interface */
if (type == QDF_IPA_STA_DISCONNECT ||
type == QDF_IPA_AP_DISCONNECT) {
for (i = 0; i < WLAN_IPA_MAX_IFACE; i++) {
iface_ctx = &ipa_ctx->iface_context[i];
if (iface_ctx->dev == net_dev)
break;
}
if (iface_ctx)
wlan_ipa_cleanup_iface(iface_ctx);
}
return QDF_STATUS_SUCCESS;
}
ipa_info("IPA resource %s completed",

2
core/hdd/src/wlan_hdd_ipa.c
View file

@ -353,7 +353,7 @@ void hdd_ipa_send_skb_to_network(qdf_nbuf_t skb, qdf_netdev_t dev)
unsigned int cpu_index;
uint8_t staid;
if (!adapter || adapter->magic != WLAN_HDD_ADAPTER_MAGIC) {
if (hdd_validate_adapter(adapter)) {
QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_DEBUG,
"Invalid adapter: 0x%pK", adapter);
kfree_skb(skb);