From 38af0dbc439adcf5ebda2bc2fa541cc01543a770 Mon Sep 17 00:00:00 2001 From: Arif Hussain Date: Mon, 13 Mar 2017 15:42:20 -0700 Subject: [PATCH] qcacmn: Add cac duration and reg domain in vdev start cmd Include cac duration and regulatory domain in vdev start command, these fields are used to process phyerrors when dfs is offloaded to firmware. Change-Id: I5736354913fafb7776ac71e85dc23e841de94a96 CRs-Fixed: 2017481 --- wmi/inc/wmi_unified_param.h | 4 ++++ wmi/src/wmi_unified_tlv.c | 7 +++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/wmi/inc/wmi_unified_param.h b/wmi/inc/wmi_unified_param.h index 48bfda8eb7..2b616908db 100644 --- a/wmi/inc/wmi_unified_param.h +++ b/wmi/inc/wmi_unified_param.h @@ -614,6 +614,8 @@ struct mac_ssid { * @reg_info_1: to update min power, max power, * reg power and reg class id * @reg_info_2: to update antennamax + * @cac_duration_ms: cac duration in milliseconds + * @regdomain: Regulatory domain * @oper_mode: Operating mode * @dfs_pri_multiplier: DFS primary multiplier * allow pulse if they are within multiple of PRI for the radar type @@ -643,6 +645,8 @@ struct vdev_start_params { uint32_t num_noa_descriptors; uint32_t preferred_rx_streams; uint32_t preferred_tx_streams; + uint32_t cac_duration_ms; + uint32_t regdomain; #ifndef CONFIG_MCL uint8_t oper_mode; int32_t dfs_pri_multiplier; diff --git a/wmi/src/wmi_unified_tlv.c b/wmi/src/wmi_unified_tlv.c index c95308de49..54393939bf 100644 --- a/wmi/src/wmi_unified_tlv.c +++ b/wmi/src/wmi_unified_tlv.c @@ -352,6 +352,8 @@ static QDF_STATUS send_vdev_start_cmd_tlv(wmi_unified_t wmi_handle, cmd->num_noa_descriptors = req->num_noa_descriptors; cmd->preferred_rx_streams = req->preferred_rx_streams; cmd->preferred_tx_streams = req->preferred_tx_streams; + cmd->cac_duration_ms = req->cac_duration_ms; + cmd->regdomain = req->regdomain; buf_ptr = (uint8_t *) (((uintptr_t) cmd) + sizeof(*cmd) + sizeof(wmi_channel)); @@ -361,12 +363,13 @@ static QDF_STATUS send_vdev_start_cmd_tlv(wmi_unified_t wmi_handle, WMI_LOGA("%s: vdev_id %d freq %d chanmode %d ch_info: 0x%x is_dfs %d " "beacon interval %d dtim %d center_chan %d center_freq2 %d " "reg_info_1: 0x%x reg_info_2: 0x%x, req->max_txpow: 0x%x " - "Tx SS %d, Rx SS %d", + "Tx SS %d, Rx SS %d, cac %d, regd %d", __func__, req->vdev_id, chan->mhz, req->chan_mode, chan->info, req->is_dfs, req->beacon_intval, cmd->dtim_period, chan->band_center_freq1, chan->band_center_freq2, chan->reg_info_1, chan->reg_info_2, req->max_txpow, - req->preferred_tx_streams, req->preferred_rx_streams); + req->preferred_tx_streams, req->preferred_rx_streams, + req->cac_duration_ms, req->regdomain); if (req->is_restart) ret = wmi_unified_cmd_send(wmi_handle, buf, len,