Skip QD1A.190821.011 in stage-aosp-master am: e66c67c549 am: 39112a4558
am: a983b73905
Change-Id: Ie11ccc336b6af4f585d503b11c83e6acaa80bac1
diff --git a/qcwcn/wifi_hal/nan.cpp b/qcwcn/wifi_hal/nan.cpp
index 549b381..ac378fa 100644
--- a/qcwcn/wifi_hal/nan.cpp
+++ b/qcwcn/wifi_hal/nan.cpp
@@ -1260,6 +1260,7 @@
//error case should not happen print log
ALOGE("%s: Wrong NAN subcmd received %d", __FUNCTION__, mSubcmd);
}
+ mNanVendorEvent = NULL;
return NL_SKIP;
}
diff --git a/qcwcn/wifi_hal/nan_rsp.cpp b/qcwcn/wifi_hal/nan_rsp.cpp
index 721ab49..f0b9b1c 100644
--- a/qcwcn/wifi_hal/nan_rsp.cpp
+++ b/qcwcn/wifi_hal/nan_rsp.cpp
@@ -350,7 +350,7 @@
char tlvInfo[NAN_ERROR_STR_LEN];
tlvInfo[0] = '\0';
- if (isNanResponse() || (is_ndp_rsp == true)){
+ if ((is_ndp_rsp == true) || isNanResponse()) {
pRsp = (NanResponseMsg*)pResponse;
for (i = 0; i < (int)(sizeof(errorCodeTranslation)/ sizeof(errorCode)); i++) {
if (errorCodeTranslation[i].firmwareError == firmwareErrorRecvd) {