From 1bf4fb8c2a9105499c55b68f5340bf1f08283908 Mon Sep 17 00:00:00 2001 From: Vignesh Mohan Date: Mon, 5 Aug 2019 18:20:53 +0530 Subject: [PATCH] qca-wifi: Add dfs_set_cfreq2 flag in multivdev_restart channel params While switching to 36 HT160 as part of multivdev restart, the channel params to be sent to FW are only updated with primary segment dfs set flag. Consider if the primary channel is 36 (non DFS), in which case, the primary HT80 segment is non DFS, but secondary HT80 segment is DFS. This will be indicated to FW by sending the flags with dfs_set as FALSE and dfs_set_cfreq2 as TRUE. But since dfs_set_cfreq2 is not updated incase of multivdev restart, FW does not detect radar in the secondary detector. Add proper dfs_set_cfreq2 flag in multivdev_restart channel params. Change-Id: I875534c3f61b1d9a36efe1ec63505332a59a4dd1 CRs-Fixed: 2496923 --- wmi/src/wmi_unified_ap_tlv.c | 3 +++ wmi/src/wmi_unified_non_tlv.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/wmi/src/wmi_unified_ap_tlv.c b/wmi/src/wmi_unified_ap_tlv.c index be19348107..6064f3cec9 100644 --- a/wmi/src/wmi_unified_ap_tlv.c +++ b/wmi/src/wmi_unified_ap_tlv.c @@ -1437,6 +1437,9 @@ static QDF_STATUS send_multiple_vdev_restart_req_cmd_tlv( if (tchan_info->dfs_set) WMI_SET_CHANNEL_FLAG(chan_info, WMI_CHAN_FLAG_DFS); + if (tchan_info->dfs_set_cfreq2) + WMI_SET_CHANNEL_FLAG(chan_info, WMI_CHAN_FLAG_DFS_CFREQ2); + if (tchan_info->allow_vht) WMI_SET_CHANNEL_FLAG(chan_info, WMI_CHAN_FLAG_ALLOW_VHT); diff --git a/wmi/src/wmi_unified_non_tlv.c b/wmi/src/wmi_unified_non_tlv.c index 20b83e6067..b568643ebb 100644 --- a/wmi/src/wmi_unified_non_tlv.c +++ b/wmi/src/wmi_unified_non_tlv.c @@ -9781,6 +9781,9 @@ QDF_STATUS send_multiple_vdev_restart_req_cmd_non_tlv( if (tchan_info->dfs_set) WMI_SET_CHANNEL_FLAG(chan_info, WMI_CHAN_FLAG_DFS); + if (tchan_info->dfs_set_cfreq2) + WMI_SET_CHANNEL_FLAG(chan_info, WMI_CHAN_FLAG_DFS_CFREQ2); + if (tchan_info->allow_vht) WMI_SET_CHANNEL_FLAG(chan_info, WMI_CHAN_FLAG_ALLOW_VHT); else if (tchan_info->allow_ht)