From 4116e09ba49ebe3dc245e45296a89362a548de2c Mon Sep 17 00:00:00 2001 From: Jianmin Zhu Date: Fri, 13 Mar 2020 13:18:07 +0800 Subject: [PATCH] qcacld-3.0: Fill vdev mlme bss channel for all vdev mode In vdev start response handler, if vdev start success, copy desire channel to bss channel for all mode: STA, AP, IBSS etc. Change-Id: Ie0767952bc3831235adcece5ba59ad0f32ee76fe CRs-Fixed: 2640898 --- core/wma/src/wma_dev_if.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/core/wma/src/wma_dev_if.c b/core/wma/src/wma_dev_if.c index ea99ea008279..5645aed31b50 100644 --- a/core/wma/src/wma_dev_if.c +++ b/core/wma/src/wma_dev_if.c @@ -1233,6 +1233,12 @@ QDF_STATUS wma_vdev_start_resp_handler(struct vdev_mlme_obj *vdev_mlme, if (wma_is_vdev_in_ap_mode(wma, rsp->vdev_id)) tgt_dfs_radar_enable(wma->pdev, 0, 0, true); + iface = &wma->interfaces[rsp->vdev_id]; + if (!iface->vdev) { + wma_err("Invalid vdev"); + return QDF_STATUS_E_FAILURE; + } + if (rsp->status == QDF_STATUS_SUCCESS) { wma->interfaces[rsp->vdev_id].tx_streams = rsp->cfgd_tx_streams; @@ -1256,9 +1262,13 @@ QDF_STATUS wma_vdev_start_resp_handler(struct vdev_mlme_obj *vdev_mlme, rsp->cfgd_rx_streams, rsp->chain_mask, wma->interfaces[rsp->vdev_id].mac_id); + + /* Fill bss_chan after vdev start */ + qdf_mem_copy(iface->vdev->vdev_mlme.bss_chan, + iface->vdev->vdev_mlme.des_chan, + sizeof(struct wlan_channel)); } - iface = &wma->interfaces[rsp->vdev_id]; if (wma_is_vdev_in_ap_mode(wma, rsp->vdev_id)) { wma_dcs_clear_vdev_starting(mac_ctx, rsp->vdev_id); wma_dcs_wlan_interference_mitigation_enable(mac_ctx,