Merge "wlan: Skip IE which has length less than the minimum valid IE length" into wlan-driver.lnx.1.0
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index d70b5e3..62ac453 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -5081,6 +5081,11 @@
j++;
}
+ if (j != pReqMsg->buckets[bktIndex].numChannels) {
+ hddLog(LOG1, FL("Input parameters didn't match"));
+ return -EINVAL;
+ }
+
bktIndex++;
}
diff --git a/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c b/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
index 93199b1..f4b599c 100644
--- a/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
+++ b/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
@@ -2643,6 +2643,16 @@
case eLIM_BT_AMP_STA_ROLE:
switch (psessionEntry->limSmeState)
{
+ /* cleanup FT session and proceed with disconnect
+ * if received disconnect from supplicant when roaming
+ * and lim state is eLIM_SME_WT_REASSOC_STATE. As the
+ * FT session would have already created but is not cleaned.
+ * This will prevent sending duplicate add bss request,
+ * if we try to disconnect and connect to the same AP
+ */
+ case eLIM_SME_WT_REASSOC_STATE:
+ limFTCleanup(pMac);
+ /* Fall through */
case eLIM_SME_ASSOCIATED_STATE:
case eLIM_SME_LINK_EST_STATE:
limLog(pMac, LOG1, FL("Rcvd SME_DISASSOC_REQ while in "