am 0db016e..c125981 from mirror-m-wireless-internal-release
c125981 Wi-Fi HAL: Remove sending registration msg to driver
063058f WiFi-HAL: Process log completion event
cd2e2fd WiFi-HAL: Clean up wake lock event processing
d3ebf0d Wifi-HAL: Enable connectivity events
d8ed4eb Wifi-HAL: Changes as per Logging Header changes
6988c4d Wi-Fi HAL: Add support to get tdls capabilities
0910ea7 Wi-Fi HAL: Fix a GScan get cached results bug
ae226e1 Wi-Fi HAL: Updating the wifi_hal function table
16b2e84 Enable rx payload and few other stats in packet stats
0b7d2d5 Wi-Fi HAL: Add version field to the packet log structure
diff --git a/qcwcn/wifi_hal/Android.mk b/qcwcn/wifi_hal/Android.mk
index a6ae17e..4022f19 100644
--- a/qcwcn/wifi_hal/Android.mk
+++ b/qcwcn/wifi_hal/Android.mk
@@ -18,11 +18,10 @@
# ============================================================
include $(CLEAR_VARS)
-LOCAL_REQUIRED_MODULES :=
+LOCAL_CFLAGS := -Wno-unused-parameter
-LOCAL_CFLAGS += -Wno-unused-parameter -Wno-int-to-pointer-cast
-LOCAL_CFLAGS += -Wno-maybe-uninitialized -Wno-parentheses -DNAN_2_0
-LOCAL_CPPFLAGS += -Wno-conversion-null
+# gscan.cpp: address of array 'cached_results[i].results' will always evaluate to 'true'
+LOCAL_CLANG_CFLAGS := -Wno-pointer-bool-conversion
LOCAL_C_INCLUDES += \
$(LOCAL_PATH) \
@@ -54,7 +53,6 @@
LOCAL_MODULE := libwifi-hal-qcom
LOCAL_SHARED_LIBRARIES += libnetutils liblog
-LOCAL_SHARED_LIBRARIES += libdl
ifneq ($(wildcard external/libnl),)
LOCAL_SHARED_LIBRARIES += libnl
@@ -70,10 +68,13 @@
LOCAL_REQUIRED_MODULES :=
-LOCAL_CFLAGS += -Wno-unused-parameter -Wno-int-to-pointer-cast
-LOCAL_CFLAGS += -Wno-maybe-uninitialized -Wno-parentheses -DNAN_2_0
+LOCAL_CFLAGS += -Wno-unused-parameter
+LOCAL_CFLAGS += -DNAN_2_0
LOCAL_CPPFLAGS += -Wno-conversion-null
+# gscan.cpp: address of array 'cached_results[i].results' will always evaluate to 'true'
+LOCAL_CLANG_CFLAGS := -Wno-pointer-bool-conversion
+
LOCAL_C_INCLUDES += \
$(LOCAL_PATH) \
external/libnl/include \
diff --git a/qcwcn/wifi_hal/gscan.cpp b/qcwcn/wifi_hal/gscan.cpp
index aa9b273..436d74b 100644
--- a/qcwcn/wifi_hal/gscan.cpp
+++ b/qcwcn/wifi_hal/gscan.cpp
@@ -17,6 +17,7 @@
#include "sync.h"
#define LOG_TAG "WifiHAL"
#include <utils/Log.h>
+#include <errno.h>
#include <time.h>
#include <errno.h>
diff --git a/qcwcn/wifi_hal/gscan_event_handler.cpp b/qcwcn/wifi_hal/gscan_event_handler.cpp
index ee5d822..dc54c70 100644
--- a/qcwcn/wifi_hal/gscan_event_handler.cpp
+++ b/qcwcn/wifi_hal/gscan_event_handler.cpp
@@ -1082,7 +1082,7 @@
unsigned i=0;
int ret = WIFI_SUCCESS;
u32 status;
- wifi_scan_result *result;
+ wifi_scan_result *result = NULL;
struct nlattr *tbVendor[QCA_WLAN_VENDOR_ATTR_GSCAN_RESULTS_MAX + 1];
WifiVendorCommand::handleEvent(event);
diff --git a/qcwcn/wifi_hal/nan_ind.cpp b/qcwcn/wifi_hal/nan_ind.cpp
index fef1277..85d747d 100755
--- a/qcwcn/wifi_hal/nan_ind.cpp
+++ b/qcwcn/wifi_hal/nan_ind.cpp
@@ -21,6 +21,7 @@
#include "wifi_hal.h"
#include "nan_i.h"
#include "nancommand.h"
+#include <errno.h>
#define NAN_TERMINATED_BEGINNING_OFFSET 8192
diff --git a/qcwcn/wifi_hal/nan_req.cpp b/qcwcn/wifi_hal/nan_req.cpp
index 7eb7d97..dd9b787 100755
--- a/qcwcn/wifi_hal/nan_req.cpp
+++ b/qcwcn/wifi_hal/nan_req.cpp
@@ -1050,8 +1050,9 @@
const NanFurtherAvailabilityMap *pFam,
u8 *pOutValue)
{
+//ToDo: Fixme - build issue
+#if 0
int idx = 0;
-
if (pFam && pOutValue) {
u32 famsize = calcNanFurtherAvailabilityMapSize(pFam);
pNanFurtherAvailabilityMapAttrTlv pFwReq = \
@@ -1079,6 +1080,7 @@
ALOGI("%s: Filled FurtherAvailabilityMapVal", __func__);
hexdump((char*)pOutValue, famsize);
}
+#endif
return;
}
@@ -1091,7 +1093,8 @@
/* Fixed size of u8 for numchans*/
ret = sizeof(u8);
/* numchans * sizeof(FamChannels) */
- ret += (pFam->numchans * sizeof(NanFurtherAvailabilityChan));
+ //ToDo: Fix build
+ //ret += (pFam->numchans * sizeof(NanFurtherAvailabilityChan));
}
ALOGI("%s:size:%d", __func__, ret);
return ret;
diff --git a/qcwcn/wifi_hal/rtt.cpp b/qcwcn/wifi_hal/rtt.cpp
index 702392d..4c064d1 100644
--- a/qcwcn/wifi_hal/rtt.cpp
+++ b/qcwcn/wifi_hal/rtt.cpp
@@ -281,3 +281,4 @@
}
return (wifi_error)ret;
}
+
diff --git a/qcwcn/wifi_hal/tdls.cpp b/qcwcn/wifi_hal/tdls.cpp
index c5db64d..a01ea42 100755
--- a/qcwcn/wifi_hal/tdls.cpp
+++ b/qcwcn/wifi_hal/tdls.cpp
@@ -386,7 +386,7 @@
nl_data = pTdlsCommand->attr_start(NL80211_ATTR_VENDOR_DATA);
if (!nl_data)
goto cleanup;
- ALOGD("%s: MAC_ADDR: "MAC_ADDR_STR, __FUNCTION__, MAC_ADDR_ARRAY(addr));
+ ALOGD("%s: MAC_ADDR: " MAC_ADDR_STR, __FUNCTION__, MAC_ADDR_ARRAY(addr));
ret = pTdlsCommand->put_bytes(QCA_WLAN_VENDOR_ATTR_TDLS_ENABLE_MAC_ADDR,
(char *)addr, 6);
if (ret < 0)
@@ -463,7 +463,7 @@
if (ret < 0)
goto cleanup;
ALOGD("%s: ifindex obtained:%d", __FUNCTION__, ret);
- ALOGD("%s: MAC_ADDR: "MAC_ADDR_STR, __FUNCTION__, MAC_ADDR_ARRAY(addr));
+ ALOGD("%s: MAC_ADDR: " MAC_ADDR_STR, __FUNCTION__, MAC_ADDR_ARRAY(addr));
/* Add the attributes */
nl_data = pTdlsCommand->attr_start(NL80211_ATTR_VENDOR_DATA);