Unverified Commit 616cba94 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!12061 net/mlx5: Fix bridge mode operations when there are no VFs 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zhang Changzhong <zhangchangzhong@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/WQBFMLMWVZZKSKW6YP7WZMMASPP6MWMR/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAU9OW 
 
Link:https://gitee.com/openeuler/kernel/pulls/12061

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 1a021e04 b01f3aea

drivers/net/ethernet/mellanox/mlx5/core/esw/legacy.c

+2 −2
Original line number Diff line number Diff line
@@ -319,7 +319,7 @@ int mlx5_eswitch_set_vepa(struct mlx5_eswitch *esw, u8 setting) 
		return -EPERM;



	mutex_lock(&esw->state_lock);

	if (esw->mode != MLX5_ESWITCH_LEGACY) {

	if (esw->mode != MLX5_ESWITCH_LEGACY || !mlx5_esw_is_fdb_created(esw)) {

		err = -EOPNOTSUPP;

		goto out;

	}
@@ -339,7 +339,7 @@ int mlx5_eswitch_get_vepa(struct mlx5_eswitch *esw, u8 *setting) 
	if (!mlx5_esw_allowed(esw))

		return -EPERM;



	if (esw->mode != MLX5_ESWITCH_LEGACY)

	if (esw->mode != MLX5_ESWITCH_LEGACY || !mlx5_esw_is_fdb_created(esw))

		return -EOPNOTSUPP;



	*setting = esw->fdb_table.legacy.vepa_uplink_rule ? 1 : 0;