diff options
| author | Amarnath Hullur Subramanyam <amarnath@codeaurora.org> | 2015-09-14 13:43:34 -0700 |
|---|---|---|
| committer | Vineeta Srivastava <vsrivastava@google.com> | 2015-09-14 15:33:11 -0700 |
| commit | 6c291551db1f39fd5da1a855986e47e09c288eb0 (patch) | |
| tree | b98c26a41f52785151bc0d8907674bc42a5133a0 | |
| parent | 19f0819fa32aec7c330b4d7ca962700230c8acb1 (diff) | |
| download | android_hardware_qcom_wlan-6c291551db1f39fd5da1a855986e47e09c288eb0.tar.gz android_hardware_qcom_wlan-6c291551db1f39fd5da1a855986e47e09c288eb0.tar.bz2 android_hardware_qcom_wlan-6c291551db1f39fd5da1a855986e47e09c288eb0.zip | |
WiFi-HAL: Fix Nan compilation issue
There was some changes done in NAN files to fix compilation
error which were incorrect. Correcting these appropriately
as part of this CL.
Bug: 24066021
Change-Id: I1131a8be34f9dc6318c98005a05f958214800fb2
| -rw-r--r-- | qcwcn/wifi_hal/Android.mk | 1 | ||||
| -rw-r--r--[-rwxr-xr-x] | qcwcn/wifi_hal/nan_req.cpp | 7 |
2 files changed, 3 insertions, 5 deletions
diff --git a/qcwcn/wifi_hal/Android.mk b/qcwcn/wifi_hal/Android.mk index 816e018..14676ff 100644 --- a/qcwcn/wifi_hal/Android.mk +++ b/qcwcn/wifi_hal/Android.mk @@ -19,6 +19,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_CFLAGS := -Wno-unused-parameter +LOCAL_CFLAGS += -DNAN_2_0 # gscan.cpp: address of array 'cached_results[i].results' will always evaluate to 'true' LOCAL_CLANG_CFLAGS := -Wno-pointer-bool-conversion diff --git a/qcwcn/wifi_hal/nan_req.cpp b/qcwcn/wifi_hal/nan_req.cpp index dd9b787..7eb7d97 100755..100644 --- a/qcwcn/wifi_hal/nan_req.cpp +++ b/qcwcn/wifi_hal/nan_req.cpp @@ -1050,9 +1050,8 @@ void NanCommand::fillNanFurtherAvailabilityMapVal( const NanFurtherAvailabilityMap *pFam, u8 *pOutValue) { -//ToDo: Fixme - build issue -#if 0 int idx = 0; + if (pFam && pOutValue) { u32 famsize = calcNanFurtherAvailabilityMapSize(pFam); pNanFurtherAvailabilityMapAttrTlv pFwReq = \ @@ -1080,7 +1079,6 @@ void NanCommand::fillNanFurtherAvailabilityMapVal( ALOGI("%s: Filled FurtherAvailabilityMapVal", __func__); hexdump((char*)pOutValue, famsize); } -#endif return; } @@ -1093,8 +1091,7 @@ int NanCommand::calcNanFurtherAvailabilityMapSize( /* Fixed size of u8 for numchans*/ ret = sizeof(u8); /* numchans * sizeof(FamChannels) */ - //ToDo: Fix build - //ret += (pFam->numchans * sizeof(NanFurtherAvailabilityChan)); + ret += (pFam->numchans * sizeof(NanFurtherAvailabilityChan)); } ALOGI("%s:size:%d", __func__, ret); return ret; |