commit 6130e17e242ba5d2cbdb301bebca41531a4ba441
author Etan Cohen <etancohen@google.com> Tue Feb 21 22:47:44 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Feb 21 22:47:45 2017 +0000
tree ff0341ea0489205fc201a8ef15af1f4432ea6d67
parent 0efe4ef377dc254d8438e11e6a477ac8f2afcec4
parent 7f42815c7a5a2c67874c567bdfb0237220e6226d

Merge "WifiHal: Add Cipher Suite to capabilities"

qcwcn/wifi_hal/nan_i.h

diff --git a/qcwcn/wifi_hal/nan_i.h b/qcwcn/wifi_hal/nan_i.h
index de4d0ce..5388b93 100644
--- a/qcwcn/wifi_hal/nan_i.h
+++ b/qcwcn/wifi_hal/nan_i.h
@@ -988,6 +988,7 @@
     u32 max_ndp_sessions;
     u32 max_app_info_len;
     u32 max_queued_transmit_followup_msgs;
+    u32 cipher_suites_supported;
 } 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 c625838..abcba91 100644
--- a/qcwcn/wifi_hal/nan_rsp.cpp
+++ b/qcwcn/wifi_hal/nan_rsp.cpp
@@ -587,6 +587,8 @@
                        pFwRsp->max_app_info_len;
             pRsp->body.nan_capabilities.max_queued_transmit_followup_msgs = \
                        pFwRsp->max_queued_transmit_followup_msgs;
+            pRsp->body.nan_capabilities.cipher_suites_supported = \
+                       pFwRsp->cipher_suites_supported;
             break;
         }
         default: