commit 4e1a2c11877b19d37ab530a71d6ad21da4f1ebf2
author Etan Cohen <etancohen@google.com> Thu Feb 23 17:43:05 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Feb 23 17:43:06 2017 +0000
tree e71d897fffc669eca07291195a11f5310ef6fbf4
parent 6130e17e242ba5d2cbdb301bebca41531a4ba441
parent 979212d9b8873ecd74873fe6f64314b514dd04ac

Merge "WifiHal: Add sdea info and subscribe addr to Capabilites"

qcwcn/wifi_hal/nan_i.h

diff --git a/qcwcn/wifi_hal/nan_i.h b/qcwcn/wifi_hal/nan_i.h
index 5388b93..abc3069 100644
--- a/qcwcn/wifi_hal/nan_i.h
+++ b/qcwcn/wifi_hal/nan_i.h
@@ -989,6 +989,8 @@
     u32 max_app_info_len;
     u32 max_queued_transmit_followup_msgs;
     u32 cipher_suites_supported;
+    u32 max_subscribe_address;
+    u32 max_sdea_service_specific_info_len;
 } NanCapabilitiesRspMsg, *pNanCapabilitiesRspMsg;
 
 /* NAN Self Transmit Followup */

qcwcn/wifi_hal/nan_rsp.cpp

diff --git a/qcwcn/wifi_hal/nan_rsp.cpp b/qcwcn/wifi_hal/nan_rsp.cpp
index abcba91..f7d786d 100644
--- a/qcwcn/wifi_hal/nan_rsp.cpp
+++ b/qcwcn/wifi_hal/nan_rsp.cpp
@@ -589,6 +589,10 @@
                        pFwRsp->max_queued_transmit_followup_msgs;
             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_sdea_service_specific_info_len = \
+                       pFwRsp->max_sdea_service_specific_info_len;
             break;
         }
         default: