diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-09-16 00:56:07 -0700 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2019-09-16 00:56:07 -0700 |
| commit | f80e33515a8ccecabd3787fa13618c3970a9073c (patch) | |
| tree | 9c7a860c139fa0e82688b1a2b52d4bd3485a0191 | |
| parent | 2568904da4c929eefb16c3fcd616bfbbfcd6c74a (diff) | |
| parent | d625fb696695fa3587c4985f3974e8a9ea40d920 (diff) | |
Merge d625fb696695fa3587c4985f3974e8a9ea40d920 on remote branch
Change-Id: Iee1914a73cca6a89a1ad797bc4c425156ee84fc1
| -rw-r--r-- | wmi/src/wmi_unified_tlv.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/wmi/src/wmi_unified_tlv.c b/wmi/src/wmi_unified_tlv.c index c11190dcbc56..a9703319f2fe 100644 --- a/wmi/src/wmi_unified_tlv.c +++ b/wmi/src/wmi_unified_tlv.c @@ -266,18 +266,6 @@ QDF_STATUS send_vdev_start_cmd_tlv(wmi_unified_t wmi_handle, cmd->beacon_interval = req->beacon_intval; cmd->dtim_period = req->dtim_period; - /* Copy the SSID */ - if (req->ssid.length) { - if (req->ssid.length < sizeof(cmd->ssid.ssid)) - cmd->ssid.ssid_len = req->ssid.length; - else - cmd->ssid.ssid_len = sizeof(cmd->ssid.ssid); - qdf_mem_copy(cmd->ssid.ssid, req->ssid.mac_ssid, - cmd->ssid.ssid_len); - } - - if (req->hidden_ssid) - cmd->flags |= WMI_UNIFIED_VDEV_START_HIDDEN_SSID; if (req->pmf_enabled) cmd->flags |= WMI_UNIFIED_VDEV_START_PMF_ENABLED; @@ -285,6 +273,18 @@ QDF_STATUS send_vdev_start_cmd_tlv(wmi_unified_t wmi_handle, if (req->ldpc_rx_enabled) cmd->flags |= WMI_UNIFIED_VDEV_START_LDPC_RX_ENABLED; } + /* Copy the SSID */ + if (req->ssid.length) { + if (req->ssid.length < sizeof(cmd->ssid.ssid)) + cmd->ssid.ssid_len = req->ssid.length; + else + cmd->ssid.ssid_len = sizeof(cmd->ssid.ssid); + qdf_mem_copy(cmd->ssid.ssid, req->ssid.mac_ssid, + cmd->ssid.ssid_len); + } + + if (req->hidden_ssid) + cmd->flags |= WMI_UNIFIED_VDEV_START_HIDDEN_SSID; cmd->num_noa_descriptors = req->num_noa_descriptors; cmd->preferred_rx_streams = req->preferred_rx_streams; |