commit 59092acc43c408a82cf17118195ecae062e57db1
author Linux Build Service Account <lnxbuild@localhost> Tue Aug 13 06:14:41 2019 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Aug 13 06:14:40 2019 -0700
tree d0557cf85bae5509770dea7801a00660e9b13573
parent 8c0ba6804b7f41636ac2bd43c7d0ffd0ce6a0c86
parent 6e70139578bb694c45b97006b125f7cc39b34ba0

Merge "qca-wifi: Add dfs_set_cfreq2 flag in multivdev_restart channel params"

wmi/src/wmi_unified_ap_tlv.c

diff --git a/wmi/src/wmi_unified_ap_tlv.c b/wmi/src/wmi_unified_ap_tlv.c
index be19348..6064f3c 100644
--- a/wmi/src/wmi_unified_ap_tlv.c
+++ b/wmi/src/wmi_unified_ap_tlv.c
@@ -1437,6 +1437,9 @@
 	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);

wmi/src/wmi_unified_non_tlv.c

diff --git a/wmi/src/wmi_unified_non_tlv.c b/wmi/src/wmi_unified_non_tlv.c
index 841f9e4..ce23fce 100644
--- a/wmi/src/wmi_unified_non_tlv.c
+++ b/wmi/src/wmi_unified_non_tlv.c
@@ -9781,6 +9781,9 @@
 	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)