A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-25 06:03:36 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacld-3.0: Make NDP channel config parameter as optional

Browse source 
Channel config is not a mandatory parameter in NDP initiator
request, hence processing as optional parameter.

Change-Id: I5af9b489cbba5601ab8d606d644adbf6f24ae3d8
CRs-Fixed: 1095382
This commit is contained in:
Ravi Joshi 2017-02-09 23:15:16 -08:00 • committed by qcabuildsw
commit 71e82f32d8
1 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
core/hdd/src/wlan_hdd_nan_datapath.c
View file

@ -463,7 +463,7 @@ static int hdd_ndi_delete_req_handler(hdd_context_t *hdd_ctx,
* QCA_WLAN_VENDOR_ATTR_NDP_IFACE_STR
* QCA_WLAN_VENDOR_ATTR_NDP_TRANSACTION_ID
* QCA_WLAN_VENDOR_ATTR_NDP_CHANNEL - optional
* QCA_WLAN_VENDOR_ATTR_NDP_CHANNEL_CONFIG
* QCA_WLAN_VENDOR_ATTR_NDP_CHANNEL_CONFIG - optional
* QCA_WLAN_VENDOR_ATTR_NDP_SERVICE_INSTANCE_ID
* QCA_WLAN_VENDOR_ATTR_NDP_PEER_DISCOVERY_MAC_ADDR
* QCA_WLAN_VENDOR_ATTR_NDP_APP_INFO - optional
@ -528,13 +528,9 @@ static int hdd_ndp_initiator_req_handler(hdd_context_t *hdd_ctx,
req.channel =
nla_get_u32(tb[QCA_WLAN_VENDOR_ATTR_NDP_CHANNEL]);
if (tb[QCA_WLAN_VENDOR_ATTR_NDP_CHANNEL_CONFIG]) {
if (tb[QCA_WLAN_VENDOR_ATTR_NDP_CHANNEL_CONFIG])
req.channel_cfg =
nla_get_u32(tb[QCA_WLAN_VENDOR_ATTR_NDP_CHANNEL_CONFIG]);
} else {
hdd_err("Channel config is unavailable");
return -EINVAL;
}
if (!tb[QCA_WLAN_VENDOR_ATTR_NDP_SERVICE_INSTANCE_ID]) {
hdd_err("NDP service instance ID is unavailable");
@ -589,8 +585,8 @@ static int hdd_ndp_initiator_req_handler(hdd_context_t *hdd_ctx,
}
hdd_info("vdev_id: %d, transaction_id: %d, channel: %d, service_instance_id: %d, ndp_app_info_len: %d, csid: %d, peer_discovery_mac_addr: %pM",
req.vdev_id, req.transaction_id, req.channel,
hdd_info("vdev_id: %d, transaction_id: %d, channel: %d, channel_cfg: %d, service_instance_id: %d, ndp_app_info_len: %d, csid: %d, peer_discovery_mac_addr: %pM",
req.vdev_id, req.transaction_id, req.channel, req.channel_cfg,
req.service_instance_id, req.ndp_info.ndp_app_info_len,
req.ncs_sk_type, req.peer_discovery_mac_addr.bytes);
status = sme_ndp_initiator_req_handler(hal, &req);