Merge 3dc4c971783a459f64720fa9a3791351bb3e18c8 on remote branch
Change-Id: I91b9300e99253ee7f7dd7d0fc75deb90199f98ea
diff --git a/CORE/HDD/inc/wlan_hdd_cfg80211.h b/CORE/HDD/inc/wlan_hdd_cfg80211.h
index 617d5bb..9ef5a8c 100644
--- a/CORE/HDD/inc/wlan_hdd_cfg80211.h
+++ b/CORE/HDD/inc/wlan_hdd_cfg80211.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2019 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -1391,10 +1391,10 @@
QCA_WLAN_VENDOR_ATTR_LINK_PROPERTIES_RATE_FLAGS = 2,
/* Unsigned 32bit value for operating frequency */
QCA_WLAN_VENDOR_ATTR_LINK_PROPERTIES_FREQ = 3,
- /* Unsigned 32bit value for STA flags*/
- QCA_WLAN_VENDOR_ATTR_LINK_PROPERTIES_STA_FLAGS = 4,
/* An array of 6 Unsigned 8bit values for the STA MAC address*/
- QCA_WLAN_VENDOR_ATTR_LINK_PROPERTIES_STA_MAC = 5,
+ QCA_WLAN_VENDOR_ATTR_LINK_PROPERTIES_MAC_ADDR = 4,
+ /* Unsigned 32bit value for STA flags*/
+ QCA_WLAN_VENDOR_ATTR_LINK_PROPERTIES_STA_FLAGS = 5,
/* KEEP LAST */
QCA_WLAN_VENDOR_ATTR_LINK_PROPERTIES_AFTER_LAST,
@@ -1733,6 +1733,29 @@
int wlan_hdd_restore_channels(hdd_context_t *pHddCtx);
/*
+ * wlan_hdd_disable_channels() - Cache the the channels
+ * and current state of the channels from the channel list
+ * received in the command and disable the channels on the
+ * wiphy and NV table.
+ * @hdd_ctx: Pointer to hdd context
+ *
+ * @return: 0 on success, Error code on failure
+ */
+int wlan_hdd_disable_channels(hdd_context_t *hdd_ctx);
+
+/*
+ * hdd_check_and_disconnect_sta_on_invalid_channel() - Disconnect STA if it is
+ * on indoor channel
+ * @hdd_ctx: pointer to hdd context
+ *
+ * STA should be disconnected before starting the SAP if it is on indoor
+ * channel.
+ *
+ * Return: void
+ */
+void hdd_check_and_disconnect_sta_on_invalid_channel(hdd_context_t *hdd_ctx);
+
+/*
* hdd_update_indoor_channel() - enable/disable indoor channel
* @hdd_ctx: hdd context
* @disable: whether to enable / disable indoor channel
@@ -1853,8 +1876,15 @@
}
#endif
-struct cfg80211_bss* wlan_hdd_cfg80211_update_bss_list(
- hdd_adapter_t *pAdapter, tSirMacAddr bssid);
+/*
+ * wlan_hdd_cfg80211_unlink_bss :to inform nl80211
+ * interface that BSS might have been lost.
+ * @pAdapter: adapter
+ * @bssid: bssid which might have been lost
+ *
+ * Return: void
+ */
+void wlan_hdd_cfg80211_unlink_bss(hdd_adapter_t *pAdapter, tSirMacAddr bssid);
struct cfg80211_bss *wlan_hdd_cfg80211_inform_bss_frame(hdd_adapter_t *pAdapter,
tSirBssDescription *bss_desc);
diff --git a/CORE/HDD/src/wlan_hdd_assoc.c b/CORE/HDD/src/wlan_hdd_assoc.c
index f7ce1b8..766e227 100644
--- a/CORE/HDD/src/wlan_hdd_assoc.c
+++ b/CORE/HDD/src/wlan_hdd_assoc.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2019 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -1249,6 +1249,13 @@
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
"wlan: disconnected");
+ if (pHddCtx->btCoexModeSet) {
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
+ FL("Wlan disconnected, sending DHCP stop indication"));
+ pHddCtx->btCoexModeSet = FALSE;
+ sme_DHCPStopInd(pHddCtx->hHal, pAdapter->device_mode,
+ pAdapter->sessionId);
+ }
type = WLAN_STA_DISASSOC_DONE_IND;
memset(wrqu.ap_addr.sa_data,'\0',ETH_ALEN);
@@ -1872,7 +1879,7 @@
/* clear scan cache for Link Lost */
if (pRoamInfo && !pRoamInfo->reasonCode &&
(eCSR_ROAM_LOSTLINK == roamStatus)) {
- wlan_hdd_cfg80211_update_bss_list(pAdapter,
+ wlan_hdd_cfg80211_unlink_bss(pAdapter,
pHddStaCtx->conn_info.bssId);
sme_remove_bssid_from_scan_list(pHddCtx->hHal,
pHddStaCtx->conn_info.bssId);
@@ -2668,7 +2675,7 @@
((eSIR_SME_JOIN_TIMEOUT_RESULT_CODE == pRoamInfo->statusCode) ||
(eSIR_SME_AUTH_TIMEOUT_RESULT_CODE == pRoamInfo->statusCode) ||
(eSIR_SME_ASSOC_TIMEOUT_RESULT_CODE == pRoamInfo->statusCode)))) {
- wlan_hdd_cfg80211_update_bss_list(pAdapter,
+ wlan_hdd_cfg80211_unlink_bss(pAdapter,
pRoamInfo ? pRoamInfo->bssid : pWextState->req_bssId);
sme_remove_bssid_from_scan_list(pHddCtx->hHal,
pRoamInfo ? pRoamInfo->bssid : pWextState->req_bssId);
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index 5155721..166217e 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -10760,16 +10760,6 @@
return result;
}
-/*
- * hdd_check_and_disconnect_sta_on_invalid_channel() - Disconnect STA if it is
- * on indoor channel
- * @hdd_ctx: pointer to hdd context
- *
- * STA should be disconnected before starting the SAP if it is on indoor
- * channel.
- *
- * Return: void
- */
void hdd_check_and_disconnect_sta_on_invalid_channel(hdd_context_t *hdd_ctx)
{
@@ -10859,6 +10849,13 @@
wiphy_channel->flags =
cache_chann->
channel_info[i].wiphy_status;
+ hddLog(VOS_TRACE_LEVEL_DEBUG,
+ "Restore channel %d reg_stat %d wiphy_stat 0x%x",
+ cache_chann->
+ channel_info[i].channel_num,
+ cache_chann->
+ channel_info[i].reg_status,
+ wiphy_channel->flags);
break;
}
}
@@ -10877,17 +10874,7 @@
return 0;
}
-/*
- * wlan_hdd_disable_channels() - Cache the the channels
- * and current state of the channels from the channel list
- * received in the command and disable the channels on the
- * wiphy and NV table.
- * @hdd_ctx: Pointer to hdd context
- *
- * @return: 0 on success, Error code on failure
- */
-
-static int wlan_hdd_disable_channels(hdd_context_t *hdd_ctx)
+int wlan_hdd_disable_channels(hdd_context_t *hdd_ctx)
{
struct hdd_cache_channels *cache_chann;
struct wiphy *wiphy;
@@ -11052,12 +11039,6 @@
hdd_check_and_disconnect_sta_on_invalid_channel(pHddCtx);
}
- if (pHostapdAdapter->device_mode == WLAN_HDD_SOFTAP) {
- /* Disable the channels received in command SET_DISABLE_CHANNEL_LIST*/
- wlan_hdd_disable_channels(pHddCtx);
- hdd_check_and_disconnect_sta_on_invalid_channel(pHddCtx);
- }
-
pHostapdState = WLAN_HDD_GET_HOSTAP_STATE_PTR(pHostapdAdapter);
pConfig = &pHostapdAdapter->sessionCtx.ap.sapConfig;
@@ -11656,8 +11637,6 @@
return 0;
error:
- if (pHostapdAdapter->device_mode == WLAN_HDD_SOFTAP)
- wlan_hdd_restore_channels(pHddCtx);
/* Revert the indoor to passive marking if START BSS fails */
if (iniConfig->disable_indoor_channel &&
pHostapdAdapter->device_mode == WLAN_HDD_SOFTAP) {
@@ -13027,8 +13006,8 @@
const v_MACADDR_t *mac_addr)
{
struct sk_buff *vendor_event;
- uint32_t sta_flags = 0;
VOS_STATUS status;
+ struct nl80211_sta_flag_update sta_flags;
ENTER();
@@ -13053,18 +13032,22 @@
return -EINVAL;
}
- sta_flags |= BIT(NL80211_STA_FLAG_AUTHORIZED);
+ sta_flags.mask |= BIT(NL80211_STA_FLAG_AUTHORIZED);
+ sta_flags.set = true;
- status = nla_put_u32(vendor_event,
- QCA_WLAN_VENDOR_ATTR_LINK_PROPERTIES_STA_FLAGS,
- sta_flags);
+ status = nla_put(vendor_event,
+ QCA_WLAN_VENDOR_ATTR_LINK_PROPERTIES_STA_FLAGS,
+ sizeof(struct nl80211_sta_flag_update),
+ &sta_flags);
+
if (status) {
hddLog(VOS_TRACE_LEVEL_ERROR, FL("STA flag put fails"));
kfree_skb(vendor_event);
return VOS_STATUS_E_FAILURE;
}
+
status = nla_put(vendor_event,
- QCA_WLAN_VENDOR_ATTR_LINK_PROPERTIES_STA_MAC,
+ QCA_WLAN_VENDOR_ATTR_LINK_PROPERTIES_MAC_ADDR,
VOS_MAC_ADDR_SIZE, mac_addr->bytes);
if (status) {
hddLog(VOS_TRACE_LEVEL_ERROR, FL("STA MAC put fails"));
@@ -14268,16 +14251,7 @@
rssi, GFP_KERNEL );
}
-/*
- * wlan_hdd_cfg80211_update_bss_list :to inform nl80211
- * interface that BSS might have been lost.
- * @pAdapter: adaptor
- * @bssid: bssid which might have been lost
- *
- * Return: bss which is unlinked from kernel cache
- */
-struct cfg80211_bss* wlan_hdd_cfg80211_update_bss_list(
- hdd_adapter_t *pAdapter, tSirMacAddr bssid)
+void wlan_hdd_cfg80211_unlink_bss(hdd_adapter_t *pAdapter, tSirMacAddr bssid)
{
struct net_device *dev = pAdapter->dev;
struct wireless_dev *wdev = dev->ieee80211_ptr;
@@ -14287,14 +14261,15 @@
bss = hdd_get_bss_entry(wiphy,
NULL, bssid,
NULL, 0);
- if (bss == NULL) {
+ if (!bss) {
hddLog(LOGE, FL("BSS not present"));
} else {
hddLog(LOG1, FL("cfg80211_unlink_bss called for BSSID "
MAC_ADDRESS_STR), MAC_ADDR_ARRAY(bssid));
cfg80211_unlink_bss(wiphy, bss);
+ /* cfg80211_get_bss get bss with ref count so release it */
+ cfg80211_put_bss(wiphy, bss);
}
- return bss;
}
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index bb3bcd8..567bce5 100644
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -3835,6 +3835,12 @@
mem_alloc_failed:
mutex_unlock(&hdd_ctx->cache_channel_lock);
+ /* Disable the channels received in command SET_DISABLE_CHANNEL_LIST*/
+ if (!is_command_repeated) {
+ wlan_hdd_disable_channels(hdd_ctx);
+ hdd_check_and_disconnect_sta_on_invalid_channel(hdd_ctx);
+ }
+
EXIT();
return ret;
@@ -10469,7 +10475,12 @@
break;
case WLAN_HDD_SOFTAP:
+ /* Delete all associated STAs before stopping AP */
+ if (test_bit(SOFTAP_BSS_STARTED, &pAdapter->event_flags))
+ hdd_del_all_sta(pAdapter);
+ /* Fall through */
case WLAN_HDD_P2P_GO:
+
if ( VOS_TRUE == bCloseSession )
{
status = hdd_sta_id_hash_detach(pAdapter);
diff --git a/CORE/HDD/src/wlan_hdd_wext.c b/CORE/HDD/src/wlan_hdd_wext.c
index 41ba21f..a8f6818 100644
--- a/CORE/HDD/src/wlan_hdd_wext.c
+++ b/CORE/HDD/src/wlan_hdd_wext.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2019 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -10369,7 +10369,7 @@
if(curr_country[0] == '0' && curr_country[1] == '0')
regulatory_hint_user("IN", NL80211_USER_REG_HINT_USER);
else
- regulatory_hint_user("OO", NL80211_USER_REG_HINT_USER);
+ regulatory_hint_user("00", NL80211_USER_REG_HINT_USER);
#else
if(curr_country[0] == '0' && curr_country[1] == '0')
regulatory_hint_user("IN");
diff --git a/CORE/HDD/src/wlan_hdd_wmm.c b/CORE/HDD/src/wlan_hdd_wmm.c
index 2edcdb7..4652958 100644
--- a/CORE/HDD/src/wlan_hdd_wmm.c
+++ b/CORE/HDD/src/wlan_hdd_wmm.c
@@ -936,6 +936,9 @@
hdd_wmm_notify_app(pQosContext);
}
+#ifdef FEATURE_WLAN_ESE
+ hdd_wmm_disable_inactivity_timer(pQosContext);
+#endif
/* Setting up QoS Failed, QoS context can be released.
* SME is releasing this flow information and if HDD doen't release this context,
* next time if application uses the same handle to set-up QoS, HDD (as it has
@@ -1173,6 +1176,9 @@
hdd_wmm_notify_app(pQosContext);
}
+#ifdef FEATURE_WLAN_ESE
+ hdd_wmm_disable_inactivity_timer(pQosContext);
+#endif
// we are done with this flow
hdd_wmm_free_context(pQosContext);
break;
@@ -1224,6 +1230,9 @@
hdd_wmm_notify_app(pQosContext);
}
+#ifdef FEATURE_WLAN_ESE
+ hdd_wmm_disable_inactivity_timer(pQosContext);
+#endif
// we are done with this flow
hdd_wmm_free_context(pQosContext);
break;
diff --git a/CORE/MAC/src/pe/lim/limAssocUtils.c b/CORE/MAC/src/pe/lim/limAssocUtils.c
index c20c7a6..1baa061 100644
--- a/CORE/MAC/src/pe/lim/limAssocUtils.c
+++ b/CORE/MAC/src/pe/lim/limAssocUtils.c
@@ -1096,10 +1096,12 @@
psessionEntry->parsedAssocReq[pStaDs->assocId] = NULL;
}
- /* Delete hash entry on add sta failure */
- limReleasePeerIdx(pMac, pStaDs->assocId, psessionEntry);
- limDeleteDphHashEntry(pMac, pStaDs->staAddr,
- pStaDs->assocId,psessionEntry);
+ if (pStaDs->mlmStaContext.mlmState == eLIM_MLM_WT_ADD_STA_RSP_STATE) {
+ /* Delete hash entry on add sta failure */
+ limReleasePeerIdx(pMac, pStaDs->assocId, psessionEntry);
+ limDeleteDphHashEntry(pMac, pStaDs->staAddr,
+ pStaDs->assocId,psessionEntry);
+ }
}
else
{
diff --git a/CORE/MAC/src/pe/lim/limProcessAssocReqFrame.c b/CORE/MAC/src/pe/lim/limProcessAssocReqFrame.c
index 427300d..06a4c0f 100644
--- a/CORE/MAC/src/pe/lim/limProcessAssocReqFrame.c
+++ b/CORE/MAC/src/pe/lim/limProcessAssocReqFrame.c
@@ -783,7 +783,7 @@
{
if (dot11fUnpackIeWPA(pMac,
&pAssocReq->wpa.info[4], //OUI is not taken care
- pAssocReq->wpa.length,
+ (pAssocReq->wpa.length - 4),
&Dot11fIEWPA) != DOT11F_PARSE_SUCCESS)
{
limLog(pMac, LOGE, FL("Invalid WPA IE"));
diff --git a/CORE/MAC/src/pe/lim/limProcessDisassocFrame.c b/CORE/MAC/src/pe/lim/limProcessDisassocFrame.c
index 805ad5f..88ca7f8 100644
--- a/CORE/MAC/src/pe/lim/limProcessDisassocFrame.c
+++ b/CORE/MAC/src/pe/lim/limProcessDisassocFrame.c
@@ -203,6 +203,14 @@
}
}
+ if ((psessionEntry->limSystemRole == eLIM_STA_ROLE) &&
+ psessionEntry->limMlmState == eLIM_MLM_WT_ADD_STA_RSP_STATE) {
+ PELOGE(limLog(pMac, LOGE, FL("received Disassoc from the AP in"
+ "add sta response state, disconnecting"));)
+ psessionEntry->fDeauthReceived = true;
+ return;
+ }
+
if ( (psessionEntry->limSystemRole == eLIM_AP_ROLE) ||
(psessionEntry->limSystemRole == eLIM_BT_AMP_AP_ROLE) )
{
diff --git a/CORE/WDI/CP/src/wlan_qct_wdi.c b/CORE/WDI/CP/src/wlan_qct_wdi.c
index 52583af..ac424e7 100644
--- a/CORE/WDI/CP/src/wlan_qct_wdi.c
+++ b/CORE/WDI/CP/src/wlan_qct_wdi.c
@@ -12805,6 +12805,8 @@
WDI_Status wdiStatus;
tHalAddPeriodicTxPtrn *halAddPeriodicTxPtrn;
wpt_uint8 selfStaIdx = 0;
+ wpt_uint8 ucCurrentBSSSesIdx;
+ WDI_BSSSessionType* pBSSSes = NULL;
/*-------------------------------------------------------------------------
Sanity check
@@ -12848,6 +12850,22 @@
return WDI_STATUS_E_FAILURE;
}
+ ucCurrentBSSSesIdx = WDI_FindAssocSession( pWDICtx,
+ pAddPeriodicTxPtrnParams->
+ wdiAddPeriodicTxPtrnParams.macAddr,
+ &pBSSSes);
+ if ( NULL == pBSSSes )
+ {
+ WPAL_TRACE( eWLAN_MODULE_DAL_CTRL, eWLAN_PAL_TRACE_LEVEL_ERROR,
+ "%s: Association sequence for this BSS does not exist. macBSSID "
+ MAC_ADDRESS_STR,
+ __func__,
+ MAC_ADDR_ARRAY(pAddPeriodicTxPtrnParams->
+ wdiAddPeriodicTxPtrnParams.macAddr));
+ wpalMemoryFree(pSendBuffer);
+ return WDI_STATUS_E_NOT_ALLOWED;
+ }
+
halAddPeriodicTxPtrn->selfStaIdx = selfStaIdx;
halAddPeriodicTxPtrn->ucPtrnId =
pAddPeriodicTxPtrnParams->wdiAddPeriodicTxPtrnParams.ucPtrnId;