Merge "wlan: Update spoof mac address in TL for roam scan" 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 c448ba5..bbaceff 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -8559,13 +8559,6 @@
if (hdd_is_memdump_supported())
features |= WIFI_LOGGER_MEMORY_DUMP_SUPPORTED;
- if (hdd_ctx->cfg_ini->wlanLoggingEnable &&
- hdd_ctx->cfg_ini->enableFatalEvent &&
- hdd_ctx->is_fatal_event_log_sup) {
- features |= WIFI_LOGGER_PER_PACKET_TX_RX_STATUS_SUPPORTED;
- features |= WIFI_LOGGER_CONNECT_EVENT_SUPPORTED;
- }
-
reply_skb = cfg80211_vendor_cmd_alloc_reply_skb(wiphy,
sizeof(uint32_t) + NLA_HDRLEN + NLMSG_HDRLEN);
if (!reply_skb) {
diff --git a/CORE/WDI/CP/src/wlan_qct_wdi.c b/CORE/WDI/CP/src/wlan_qct_wdi.c
index ac424e7..fac44a7 100644
--- a/CORE/WDI/CP/src/wlan_qct_wdi.c
+++ b/CORE/WDI/CP/src/wlan_qct_wdi.c
@@ -12807,6 +12807,7 @@
wpt_uint8 selfStaIdx = 0;
wpt_uint8 ucCurrentBSSSesIdx;
WDI_BSSSessionType* pBSSSes = NULL;
+ wpt_macAddr dst_addr;
/*-------------------------------------------------------------------------
Sanity check
@@ -12850,9 +12851,12 @@
return WDI_STATUS_E_FAILURE;
}
+ vos_mem_copy(dst_addr,
+ &pAddPeriodicTxPtrnParams->wdiAddPeriodicTxPtrnParams.ucPattern[0],
+ VOS_MAC_ADDR_SIZE);
+
ucCurrentBSSSesIdx = WDI_FindAssocSession( pWDICtx,
- pAddPeriodicTxPtrnParams->
- wdiAddPeriodicTxPtrnParams.macAddr,
+ dst_addr,
&pBSSSes);
if ( NULL == pBSSSes )
{
@@ -12860,8 +12864,7 @@
"%s: Association sequence for this BSS does not exist. macBSSID "
MAC_ADDRESS_STR,
__func__,
- MAC_ADDR_ARRAY(pAddPeriodicTxPtrnParams->
- wdiAddPeriodicTxPtrnParams.macAddr));
+ MAC_ADDR_ARRAY(dst_addr));
wpalMemoryFree(pSendBuffer);
return WDI_STATUS_E_NOT_ALLOWED;
}
diff --git a/Kbuild b/Kbuild
index c085b36..508e384 100644
--- a/Kbuild
+++ b/Kbuild
@@ -106,9 +106,9 @@
endif # ANDROID_BUILD_TOP
else
ifneq ($(ANDROID_BUILD_TOP),)
- WLAN_BLD_DIR := $(ANDROID_BUILD_TOP)/device/qcom/msm8909w/opensource/wlan
+ WLAN_BLD_DIR := $(ANDROID_BUILD_TOP)/device/qcom/sdm429w/opensource/wlan
else
- WLAN_BLD_DIR := device/qcom/msm8909w/opensource/wlan
+ WLAN_BLD_DIR := $(BOARD_OPENSOURCE_DIR)/wlan
endif # ANDROID_BUILD_TOP
endif # TARGET_SUPPORTS_WEARABLES
endif # WLAN_PROPRIETARY