samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacmn: Make ndp channel config parameter optional

Browse Source 
The ndp channel config has no meaning if ndp channel itself
is optional. Host will send ndp channel config as "optional"
to FW if it is missing in the ndp command.

Change-Id: I59e245f3fb05ae35aa185fba7bad09608f5334c8
CRs-Fixed: 2072502
This commit is contained in:
Naveen Rawat
2017-07-03 13:00:48 -07:00
committed by Anjaneedevi Kapparapu
parent 7981ec30cb
commit 25b1887267
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/os_if_nan.c
View File

@@ -296,17 +296,18 @@ static int os_if_nan_process_ndp_initiator_req(struct wlan_objmgr_psoc *psoc,
req.transaction_id = req.transaction_id =
nla_get_u16(tb[QCA_WLAN_VENDOR_ATTR_NDP_TRANSACTION_ID]); nla_get_u16(tb[QCA_WLAN_VENDOR_ATTR_NDP_TRANSACTION_ID]);
if (tb[QCA_WLAN_VENDOR_ATTR_NDP_CHANNEL]) if (tb[QCA_WLAN_VENDOR_ATTR_NDP_CHANNEL]) {
req.channel = nla_get_u32(tb[QCA_WLAN_VENDOR_ATTR_NDP_CHANNEL]); 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 = req.channel_cfg = nla_get_u32(
nla_get_u32(tb[QCA_WLAN_VENDOR_ATTR_NDP_CHANNEL_CONFIG]); tb[QCA_WLAN_VENDOR_ATTR_NDP_CHANNEL_CONFIG]);
} else { } else {
cfg80211_err("Channel config is unavailable"); cfg80211_err("Channel config is unavailable");
ret = -EINVAL; ret = -EINVAL;
goto initiator_req_failed; goto initiator_req_failed;
} }
}
if (!tb[QCA_WLAN_VENDOR_ATTR_NDP_SERVICE_INSTANCE_ID]) { if (!tb[QCA_WLAN_VENDOR_ATTR_NDP_SERVICE_INSTANCE_ID]) {
cfg80211_err("NDP service instance ID is unavailable"); cfg80211_err("NDP service instance ID is unavailable");