diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2020-02-03 06:26:17 -0800 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2020-02-03 06:26:17 -0800 |
| commit | fe3c61ada89e18faecb85b793c394ce115e2d2fe (patch) | |
| tree | c18da8e5b9cd123b66cc0d368140f806311cb388 | |
| parent | fab73802370bd460f3d12cf34851efee219d9ff8 (diff) | |
| parent | 35e0ae41c368c9f8ec341cfee7ab28a381ff3da6 (diff) | |
Merge 35e0ae41c368c9f8ec341cfee7ab28a381ff3da6 on remote branch
Change-Id: Ifc4a205414ca36c7a4c7d08f288fa2e3adafcf73
| -rw-r--r-- | wmi/inc/wmi_unified_param.h | 24 | ||||
| -rw-r--r-- | wmi/src/wmi_unified_tlv.c | 3 |
2 files changed, 27 insertions, 0 deletions
diff --git a/wmi/inc/wmi_unified_param.h b/wmi/inc/wmi_unified_param.h index 7c2759210c8b..6963aba596f7 100644 --- a/wmi/inc/wmi_unified_param.h +++ b/wmi/inc/wmi_unified_param.h @@ -285,6 +285,28 @@ typedef enum { WMI_HOST_MODE_MAX = 16 } WMI_HOST_WLAN_PHY_MODE; +/** + * enum wmi_host_channel_width: Channel operating width. Maps to + * wmi_channel_width used in firmware header file(s). + * @WMI_HOST_CHAN_WIDTH_20: 20 MHz channel operating width + * @WMI_HOST_CHAN_WIDTH_40: 40 MHz channel operating width + * @WMI_HOST_CHAN_WIDTH_80: 80 MHz channel operating width + * @WMI_HOST_CHAN_WIDTH_160: 160 MHz channel operating width + * @WMI_HOST_CHAN_WIDTH_80P80: 80+80 MHz channel operating width + * @WMI_HOST_CHAN_WIDTH_5: 5 MHz channel operating width + * @WMI_HOST_CHAN_WIDTH_10: 10 MHz channel operating width + * @WMI_HOST_CHAN_WIDTH_165: 165 MHz channel operating width + */ +typedef enum { + WMI_HOST_CHAN_WIDTH_20 = 0, + WMI_HOST_CHAN_WIDTH_40 = 1, + WMI_HOST_CHAN_WIDTH_80 = 2, + WMI_HOST_CHAN_WIDTH_160 = 3, + WMI_HOST_CHAN_WIDTH_80P80 = 4, + WMI_HOST_CHAN_WIDTH_5 = 5, + WMI_HOST_CHAN_WIDTH_10 = 6, + WMI_HOST_CHAN_WIDTH_165 = 7, +} wmi_host_channel_width; /** * enum wmi_dwelltime_adaptive_mode: dwelltime_mode @@ -1126,6 +1148,7 @@ struct scan_stop_params { /** * struct scan_chan_list_params - scan channel list cmd parameter * @num_scan_chans: no of scan channels + * @max_bw_support_present: max BW support present * @chan_info: pointer to wmi channel info */ #ifdef CONFIG_MCL @@ -1149,6 +1172,7 @@ typedef struct { struct scan_chan_list_params { uint8_t num_scan_chans; + bool max_bw_support_present; wmi_channel_param *chan_info; }; #else diff --git a/wmi/src/wmi_unified_tlv.c b/wmi/src/wmi_unified_tlv.c index 687a2b23e57b..6ce7e3f2f2e9 100644 --- a/wmi/src/wmi_unified_tlv.c +++ b/wmi/src/wmi_unified_tlv.c @@ -1778,6 +1778,9 @@ QDF_STATUS send_scan_chan_list_cmd_tlv(wmi_unified_t wmi_handle, WMI_LOGD("no of channels = %d, len = %d", chan_list->num_scan_chans, len); cmd->num_scan_chans = chan_list->num_scan_chans; + if (chan_list->max_bw_support_present) + cmd->flags |= CHANNEL_MAX_BANDWIDTH_VALID; + WMITLV_SET_HDR((buf_ptr + sizeof(wmi_scan_chan_list_cmd_fixed_param)), WMITLV_TAG_ARRAY_STRUC, sizeof(wmi_channel) * chan_list->num_scan_chans); |