diff options
| author | Naveen Rawat <nrawat@qca.qualcomm.com> | 2016-06-03 11:11:39 -0700 |
|---|---|---|
| committer | Anjaneedevi Kapparapu <akappa@codeaurora.org> | 2016-06-14 16:13:33 +0530 |
| commit | f7801917bb65e7da2778c848c603e5f5d5809b01 (patch) | |
| tree | fb2ac724cd118d34a7bde4bfb5945655fca90792 | |
| parent | f8d75e826ad1b800c55dedf5d3dc2f32ff387576 (diff) | |
qcacld-2.0: Change NDP_SERVICE_INSTANCE_ID from 16 bits to 32 bits
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 | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/CORE/HDD/src/wlan_hdd_nan_datapath.c b/CORE/HDD/src/wlan_hdd_nan_datapath.c index 449ad944f750..fc1d45d82f7c 100644 --- a/CORE/HDD/src/wlan_hdd_nan_datapath.c +++ b/CORE/HDD/src/wlan_hdd_nan_datapath.c @@ -42,7 +42,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, @@ -518,7 +518,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]); vos_mem_copy(req.self_ndi_mac_addr.bytes, adapter->macAddressCurrent.bytes, VOS_MAC_ADDR_SIZE); @@ -1305,7 +1305,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) @@ -1366,10 +1366,9 @@ static void hdd_ndp_indication_handler(hdd_adapter_t *adapter, return; } - data_len = 3 * sizeof(uint32_t) + sizeof(uint16_t) + - 2 * VOS_MAC_ADDR_SIZE + IFNAMSIZ + - event->ndp_info.ndp_app_info_len + 8 * NLA_HDRLEN + - NLMSG_HDRLEN; + data_len = (4 * sizeof(uint32_t)) + (2 * VOS_MAC_ADDR_SIZE) + IFNAMSIZ + + event->ndp_info.ndp_app_info_len + (8 * NLA_HDRLEN) + + NLMSG_HDRLEN; /* notify response to the upper layer */ vendor_event = cfg80211_vendor_event_alloc(hdd_ctx->wiphy, @@ -1389,7 +1388,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; |