prima: Do not enable BMPS if tdls action frame tx fails.
If tdls action frame tx fails then driver is enabling the BMPS.
The supplicant is sending NL80211_TDLS_DISABLE_LINK once it
detects the timeout caused by action frame tx fail.
As part of handling NL80211_TDLS_DISABLE_LINK, the driver is
sending del sta for tdls peer to firmware.
This makes firmware to receive the enter BMPS first followed by
del sta and resulting in crash.
The fix is to not enter into the BMPS mode if tdls action frame
tx fails. It will be taken care by the driver while processing
NL80211_TDLS_DISABLE_LINK.
Change-Id: I7d1080125dbae68229166b1c35ea945a79caf621
CRs-Fixed: 783910
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index 542efc1..c98c16f 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -13943,6 +13943,7 @@
int max_sta_failed = 0;
int responder;
long rc;
+ int ret;
#if !(TDLS_MGMT_VERSION2)
u32 peer_capability = 0;
#endif
@@ -14109,7 +14110,8 @@
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
"%s: " MAC_ADDRESS_STR " action %d couldn't sent, as one is pending. return EBUSY",
__func__, MAC_ADDR_ARRAY(peer), action_code);
- return -EBUSY;
+ ret = -EBUSY;
+ goto tx_failed;
}
pAdapter->mgmtTxCompletionStatus = TDLS_CTX_MAGIC;
@@ -14123,8 +14125,8 @@
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
"%s: sme_SendTdlsMgmtFrame failed!", __func__);
pAdapter->mgmtTxCompletionStatus = FALSE;
- wlan_hdd_tdls_check_bmps(pAdapter);
- return -EINVAL;
+ ret = -EINVAL;
+ goto tx_failed;
}
rc = wait_for_completion_interruptible_timeout(&pAdapter->tdls_mgmt_comp,
@@ -14144,14 +14146,14 @@
return -EAGAIN;
}
- wlan_hdd_tdls_check_bmps(pAdapter);
- return -EINVAL;
+ ret = -EINVAL;
+ goto tx_failed;
}
if (max_sta_failed)
{
- wlan_hdd_tdls_check_bmps(pAdapter);
- return max_sta_failed;
+ ret = max_sta_failed;
+ goto tx_failed;
}
if (SIR_MAC_TDLS_SETUP_RSP == action_code)
@@ -14164,6 +14166,20 @@
}
return 0;
+
+tx_failed:
+ /* add_station will be called before sending TDLS_SETUP_REQ and
+ * TDLS_SETUP_RSP and as part of add_station driver will enable
+ * BMPS. NL80211_TDLS_DISABLE_LINK will be called if the tx of
+ * TDLS_SETUP_REQ or TDLS_SETUP_RSP fails. BMPS will be enabled
+ * as part of processing NL80211_TDLS_DISABLE_LINK. So need to
+ * enable BMPS for TDLS_SETUP_REQ and TDLS_SETUP_RSP if tx fails.
+ */
+
+ if ((SIR_MAC_TDLS_SETUP_REQ == action_code) ||
+ (SIR_MAC_TDLS_SETUP_RSP == action_code))
+ wlan_hdd_tdls_check_bmps(pAdapter);
+ return ret;
}
#if TDLS_MGMT_VERSION2