Merge "WifiHal: Always include the Service responder policy"
diff --git a/qcwcn/wifi_hal/nan_req.cpp b/qcwcn/wifi_hal/nan_req.cpp
index e0d4c5d..dbf6411 100644
--- a/qcwcn/wifi_hal/nan_req.cpp
+++ b/qcwcn/wifi_hal/nan_req.cpp
@@ -566,7 +566,7 @@
(pReq->service_specific_info_len ? SIZEOF_TLV_HDR + pReq->service_specific_info_len : 0) +
(pReq->rx_match_filter_len ? SIZEOF_TLV_HDR + pReq->rx_match_filter_len : 0) +
(pReq->tx_match_filter_len ? SIZEOF_TLV_HDR + pReq->tx_match_filter_len : 0) +
- (pReq->service_responder_policy ? SIZEOF_TLV_HDR + sizeof(NanServiceAcceptPolicy) : 0) +
+ (SIZEOF_TLV_HDR + sizeof(NanServiceAcceptPolicy)) +
(pReq->cipher_type ? SIZEOF_TLV_HDR + sizeof(NanCsidType) : 0) +
(pReq->pmk_len ? SIZEOF_TLV_HDR + NAN_PMK_INFO_LEN : 0) +
((pReq->sdea_params.config_nan_data_path || pReq->sdea_params.security_cfg ||
@@ -630,10 +630,11 @@
tlvs = addTlv(NAN_TLV_TYPE_TX_MATCH_FILTER, pReq->tx_match_filter_len,
(const u8*)&pReq->tx_match_filter[0], tlvs);
}
- if (pReq->service_responder_policy) {
- tlvs = addTlv(NAN_TLV_TYPE_NAN_SERVICE_ACCEPT_POLICY, sizeof(NanServiceAcceptPolicy),
- (const u8*)&pReq->service_responder_policy, tlvs);
- }
+
+ /* Pass the Accept policy always */
+ tlvs = addTlv(NAN_TLV_TYPE_NAN_SERVICE_ACCEPT_POLICY, sizeof(NanServiceAcceptPolicy),
+ (const u8*)&pReq->service_responder_policy, tlvs);
+
if (pReq->cipher_type) {
NanCsidType pNanCsidType;
pNanCsidType.csid_type = pReq->cipher_type;