From 6812dd9d092a89aab43195e27b4a59ea553fe0e1 Mon Sep 17 00:00:00 2001 From: Srinivas Dasari Date: Fri, 14 Aug 2020 19:41:34 +0530 Subject: [PATCH] qcacmn: Inform fw if NAN is disabled on an SRD channel Firmware expects the channel property WMI_CHAN_FLAG_NAN_DISABLED to be set if NAN is not allowed on any channel. Firmware shall check the flag and decides whether to enable NAN/NDP on that channel. Change-Id: I8e283d2cd0f83a43e04dad142b09d519ef7f0db3 CRs-Fixed: 2760348 --- wmi/inc/wmi_unified_param.h | 4 +++- wmi/src/wmi_unified_tlv.c | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/wmi/inc/wmi_unified_param.h b/wmi/inc/wmi_unified_param.h index 706a01c77a33..86069f166326 100644 --- a/wmi/inc/wmi_unified_param.h +++ b/wmi/inc/wmi_unified_param.h @@ -641,6 +641,7 @@ typedef enum { * @set_agile: is agile mode * @allow_he: HE allowed on chan * @psc_channel: 6 ghz preferred scan chan + * @nan_disabled: is NAN disabled on @mhz * @phy_mode: phymode (vht80 or ht40 or ...) * @cfreq1: centre frequency on primary * @cfreq2: centre frequency on secondary @@ -665,7 +666,8 @@ struct channel_param { allow_vht:1, set_agile:1, allow_he:1, - psc_channel:1; + psc_channel:1, + nan_disabled:1; uint32_t phy_mode; uint32_t cfreq1; uint32_t cfreq2; diff --git a/wmi/src/wmi_unified_tlv.c b/wmi/src/wmi_unified_tlv.c index a60b93f2895c..d986973b33ba 100644 --- a/wmi/src/wmi_unified_tlv.c +++ b/wmi/src/wmi_unified_tlv.c @@ -3301,6 +3301,10 @@ static QDF_STATUS send_scan_chan_list_cmd_tlv(wmi_unified_t wmi_handle, WMI_SET_CHANNEL_FLAG(chan_info, WMI_CHAN_FLAG_PSC); + if (tchan_info->nan_disabled) + WMI_SET_CHANNEL_FLAG(chan_info, + WMI_CHAN_FLAG_NAN_DISABLED); + /* also fill in power information */ WMI_SET_CHANNEL_MIN_POWER(chan_info, tchan_info->minpower);