|
@@ -149,6 +149,35 @@ vdev_mgr_set_cur_chan_punc_pattern(struct wlan_channel *des_chan,
|
|
}
|
|
}
|
|
#endif
|
|
#endif
|
|
|
|
|
|
|
|
+#ifdef WLAN_FEATURE_11BE_MLO
|
|
|
|
+static void
|
|
|
|
+vdev_mgr_start_param_update_mlo(struct vdev_mlme_obj *mlme_obj,
|
|
|
|
+ struct vdev_start_params *param)
|
|
|
|
+{
|
|
|
|
+ struct wlan_objmgr_vdev *vdev;
|
|
|
|
+
|
|
|
|
+ vdev = mlme_obj->vdev;
|
|
|
|
+ if (!vdev) {
|
|
|
|
+ mlme_err("VDEV is NULL");
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ if (!wlan_vdev_mlme_is_mlo_vdev(vdev))
|
|
|
|
+ return;
|
|
|
|
+
|
|
|
|
+ param->mlo_flags.mlo_enabled = 1;
|
|
|
|
+
|
|
|
|
+ if (!wlan_vdev_mlme_is_mlo_link_vdev(vdev))
|
|
|
|
+ param->mlo_flags.mlo_assoc_link = 1;
|
|
|
|
+}
|
|
|
|
+#else
|
|
|
|
+static void
|
|
|
|
+vdev_mgr_start_param_update_mlo(struct vdev_mlme_obj *mlme_obj,
|
|
|
|
+ struct vdev_start_params *param)
|
|
|
|
+{
|
|
|
|
+}
|
|
|
|
+#endif
|
|
|
|
+
|
|
static QDF_STATUS vdev_mgr_start_param_update(
|
|
static QDF_STATUS vdev_mgr_start_param_update(
|
|
struct vdev_mlme_obj *mlme_obj,
|
|
struct vdev_mlme_obj *mlme_obj,
|
|
struct vdev_start_params *param)
|
|
struct vdev_start_params *param)
|
|
@@ -226,6 +255,7 @@ static QDF_STATUS vdev_mgr_start_param_update(
|
|
param->he_ops = mlme_obj->proto.he_ops_info.he_ops;
|
|
param->he_ops = mlme_obj->proto.he_ops_info.he_ops;
|
|
|
|
|
|
vdev_mgr_start_param_update_11be(mlme_obj, param, des_chan);
|
|
vdev_mgr_start_param_update_11be(mlme_obj, param, des_chan);
|
|
|
|
+ vdev_mgr_start_param_update_mlo(mlme_obj, param);
|
|
|
|
|
|
param->channel.chan_id = des_chan->ch_ieee;
|
|
param->channel.chan_id = des_chan->ch_ieee;
|
|
param->channel.pwr = mlme_obj->mgmt.generic.tx_power;
|
|
param->channel.pwr = mlme_obj->mgmt.generic.tx_power;
|
|
@@ -278,16 +308,6 @@ static QDF_STATUS vdev_mgr_start_param_update(
|
|
param->channel.dfs_set_cfreq2 = dfs_set_cfreq2;
|
|
param->channel.dfs_set_cfreq2 = dfs_set_cfreq2;
|
|
param->channel.set_agile = set_agile;
|
|
param->channel.set_agile = set_agile;
|
|
}
|
|
}
|
|
-/* WLAN_FEATURE_11BE_MLO macro is termporary,
|
|
|
|
- * will be removed once MLO testing is complete
|
|
|
|
- */
|
|
|
|
-#ifdef WLAN_FEATURE_11BE_MLO
|
|
|
|
- if (wlan_vdev_mlme_is_mlo_vdev(vdev)) {
|
|
|
|
- param->mlo_flags.mlo_enabled = 1;
|
|
|
|
- if (!wlan_vdev_mlme_is_mlo_link_vdev(vdev))
|
|
|
|
- param->mlo_flags.mlo_assoc_link = 1;
|
|
|
|
- }
|
|
|
|
-#endif
|
|
|
|
wlan_objmgr_pdev_release_ref(pdev, WLAN_MLME_SB_ID);
|
|
wlan_objmgr_pdev_release_ref(pdev, WLAN_MLME_SB_ID);
|
|
return QDF_STATUS_SUCCESS;
|
|
return QDF_STATUS_SUCCESS;
|
|
}
|
|
}
|