diff options
| author | Naveen Rawat <naveenrawat@codeaurora.org> | 2016-08-16 12:39:38 -0700 |
|---|---|---|
| committer | qcabuildsw <qcabuildsw@localhost> | 2016-09-12 19:03:23 -0700 |
| commit | 19da3d155cd126e73cf9228259879430eefdc29a (patch) | |
| tree | d66b588ca05cd3791c64a89cd868cac52aaea088 | |
| parent | 779e48688b73c76d692923a8e477079b3c83e99d (diff) | |
qcacld-3.0: Change NDP_SERVICE_INSTANCE_ID from 16 bits to 32 bits
This is qcacld-2.0 to qcacld-3.0 propagation.
Change NDP_SERVICE_INSTANCE_ID from 16 bits to 32 bits
Change-Id: I4fab1af6d9b8e34396bb3679f112c7f29bbe9f93
CRs-Fixed: 962367
| -rw-r--r-- | core/hdd/src/wlan_hdd_nan_datapath.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/core/hdd/src/wlan_hdd_nan_datapath.c b/core/hdd/src/wlan_hdd_nan_datapath.c index 16da226c94be..64ee8f085da7 100644 --- a/core/hdd/src/wlan_hdd_nan_datapath.c +++ b/core/hdd/src/wlan_hdd_nan_datapath.c @@ -41,7 +41,7 @@ qca_wlan_vendor_ndp_policy[QCA_WLAN_VENDOR_ATTR_NDP_PARAMS_MAX + 1] = { [QCA_WLAN_VENDOR_ATTR_NDP_TRANSACTION_ID] = { .type = NLA_U16 }, [QCA_WLAN_VENDOR_ATTR_NDP_IFACE_STR] = { .type = NLA_STRING, .len = IFNAMSIZ }, - [QCA_WLAN_VENDOR_ATTR_NDP_SERVICE_INSTANCE_ID] = { .type = NLA_U16 }, + [QCA_WLAN_VENDOR_ATTR_NDP_SERVICE_INSTANCE_ID] = { .type = NLA_U32 }, [QCA_WLAN_VENDOR_ATTR_NDP_CHANNEL] = { .type = NLA_U32 }, [QCA_WLAN_VENDOR_ATTR_NDP_PEER_DISCOVERY_MAC_ADDR] = { .type = NLA_BINARY, @@ -510,7 +510,7 @@ static int hdd_ndp_initiator_req_handler(hdd_context_t *hdd_ctx, return -EINVAL; } req.service_instance_id = - nla_get_u16(tb[QCA_WLAN_VENDOR_ATTR_NDP_SERVICE_INSTANCE_ID]); + nla_get_u32(tb[QCA_WLAN_VENDOR_ATTR_NDP_SERVICE_INSTANCE_ID]); qdf_mem_copy(req.self_ndi_mac_addr.bytes, adapter->macAddressCurrent.bytes, QDF_MAC_ADDR_SIZE); @@ -1293,7 +1293,7 @@ ndp_confirm_nla_failed: * QCA_WLAN_VENDOR_ATTR_NDP_SUBCMD = * QCA_WLAN_VENDOR_ATTR_NDP_REQUEST_IND (4 bytes) * QCA_WLAN_VENDOR_ATTR_NDP_IFACE_STR (IFNAMSIZ) - * QCA_WLAN_VENDOR_ATTR_NDP_SERVICE_INSTANCE_ID (2 bytes) + * QCA_WLAN_VENDOR_ATTR_NDP_SERVICE_INSTANCE_ID (4 bytes) * QCA_WLAN_VENDOR_ATTR_NDP_NDI_MAC_ADDR (6 bytes) * QCA_WLAN_VENDOR_ATTR_NDP_PEER_DISCOVERY_MAC_ADDR (6 bytes) * QCA_WLAN_VENDOR_ATTR_NDP_INSTANCE_ID (4 bytes) @@ -1352,9 +1352,8 @@ static void hdd_ndp_indication_handler(hdd_adapter_t *adapter, return; } - data_len = 3 * sizeof(uint32_t) + sizeof(uint16_t) + - 2 * QDF_MAC_ADDR_SIZE + IFNAMSIZ + - event->ndp_info.ndp_app_info_len + 8 * NLA_HDRLEN + + data_len = (4 * sizeof(uint32_t)) + (2 * QDF_MAC_ADDR_SIZE) + IFNAMSIZ + + event->ndp_info.ndp_app_info_len + (8 * NLA_HDRLEN) + NLMSG_HDRLEN; /* notify response to the upper layer */ @@ -1375,7 +1374,7 @@ static void hdd_ndp_indication_handler(hdd_adapter_t *adapter, IFNAMSIZ, adapter->dev->name)) goto ndp_indication_nla_failed; - if (nla_put_u16(vendor_event, + if (nla_put_u32(vendor_event, QCA_WLAN_VENDOR_ATTR_NDP_SERVICE_INSTANCE_ID, event->service_instance_id)) goto ndp_indication_nla_failed; |