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 @@
 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
old mode 100755
new mode 100644
index dd9b787..7eb7d97
--- a/qcwcn/wifi_hal/nan_req.cpp
+++ b/qcwcn/wifi_hal/nan_req.cpp
@@ -1050,9 +1050,8 @@
     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 @@
         ALOGI("%s: Filled FurtherAvailabilityMapVal", __func__);
         hexdump((char*)pOutValue, famsize);
     }
-#endif
     return;
 }
 
@@ -1093,8 +1091,7 @@
         /* 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;