Merge "Wifi-Hal: Fix Nan capabilities mismatch"
am: dfea8785ae
Change-Id: If931d718043b0972d46a53c7d3d3b69f9299ecd8
diff --git a/qcwcn/wifi_hal/nan_i.h b/qcwcn/wifi_hal/nan_i.h
index 640a831..8a3ae3b 100644
--- a/qcwcn/wifi_hal/nan_i.h
+++ b/qcwcn/wifi_hal/nan_i.h
@@ -1014,9 +1014,13 @@
u32 max_ndp_sessions;
u32 max_app_info_len;
u32 max_queued_transmit_followup_msgs;
+ u32 ndp_supported_bands;
u32 cipher_suites_supported;
+ u32 max_scid_len;
+ u32 is_ndp_security_supported:1;
+ u32 max_sdea_service_specific_info_len:16;
+ u32 reserved:15;
u32 max_subscribe_address;
- u32 max_sdea_service_specific_info_len;
} NanCapabilitiesRspMsg, *pNanCapabilitiesRspMsg;
/* NAN Self Transmit Followup */
diff --git a/qcwcn/wifi_hal/nan_rsp.cpp b/qcwcn/wifi_hal/nan_rsp.cpp
index 3521b99..b24c296 100644
--- a/qcwcn/wifi_hal/nan_rsp.cpp
+++ b/qcwcn/wifi_hal/nan_rsp.cpp
@@ -594,12 +594,18 @@
pFwRsp->max_app_info_len;
pRsp->body.nan_capabilities.max_queued_transmit_followup_msgs = \
pFwRsp->max_queued_transmit_followup_msgs;
+ pRsp->body.nan_capabilities.ndp_supported_bands = \
+ pFwRsp->ndp_supported_bands;
pRsp->body.nan_capabilities.cipher_suites_supported = \
pFwRsp->cipher_suites_supported;
- pRsp->body.nan_capabilities.max_subscribe_address = \
- pFwRsp->max_subscribe_address;
+ pRsp->body.nan_capabilities.max_scid_len = \
+ pFwRsp->max_scid_len;
+ pRsp->body.nan_capabilities.is_ndp_security_supported = \
+ pFwRsp->is_ndp_security_supported;
pRsp->body.nan_capabilities.max_sdea_service_specific_info_len = \
pFwRsp->max_sdea_service_specific_info_len;
+ pRsp->body.nan_capabilities.max_subscribe_address = \
+ pFwRsp->max_subscribe_address;
break;
}
default:
