Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

IB/mlx5: Rename RoCE related helpers to reflect being Eth ones

This is a pre-step towards having mlx5 IB device also over Eth ports where
RoCE is not supported. We change the roce enable/disable and roce_lag
init/fini function names to have _eth instead of _roce.

This patch doesn't change any functionality.

Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Reviewed-by: Matan Barak <matanb@mellanox.com>
Signed-off-by: Leon Romanovsky <leon@kernel.org>
Signed-off-by: Doug Ledford <dledford@redhat.com>

authored by

Or Gerlitz and committed by
Doug Ledford
45f95acd d012f5d6

+11 -11
+11 -11
drivers/infiniband/hw/mlx5/main.c
··· 2802 2802 fw_rev_min(dev->mdev), fw_rev_sub(dev->mdev)); 2803 2803 } 2804 2804 2805 - static int mlx5_roce_lag_init(struct mlx5_ib_dev *dev) 2805 + static int mlx5_eth_lag_init(struct mlx5_ib_dev *dev) 2806 2806 { 2807 2807 struct mlx5_core_dev *mdev = dev->mdev; 2808 2808 struct mlx5_flow_namespace *ns = mlx5_get_flow_namespace(mdev, ··· 2831 2831 return err; 2832 2832 } 2833 2833 2834 - static void mlx5_roce_lag_cleanup(struct mlx5_ib_dev *dev) 2834 + static void mlx5_eth_lag_cleanup(struct mlx5_ib_dev *dev) 2835 2835 { 2836 2836 struct mlx5_core_dev *mdev = dev->mdev; 2837 2837 ··· 2865 2865 } 2866 2866 } 2867 2867 2868 - static int mlx5_enable_roce(struct mlx5_ib_dev *dev) 2868 + static int mlx5_enable_eth(struct mlx5_ib_dev *dev) 2869 2869 { 2870 2870 int err; 2871 2871 ··· 2877 2877 if (err) 2878 2878 goto err_unregister_netdevice_notifier; 2879 2879 2880 - err = mlx5_roce_lag_init(dev); 2880 + err = mlx5_eth_lag_init(dev); 2881 2881 if (err) 2882 2882 goto err_disable_roce; 2883 2883 ··· 2891 2891 return err; 2892 2892 } 2893 2893 2894 - static void mlx5_disable_roce(struct mlx5_ib_dev *dev) 2894 + static void mlx5_disable_eth(struct mlx5_ib_dev *dev) 2895 2895 { 2896 - mlx5_roce_lag_cleanup(dev); 2896 + mlx5_eth_lag_cleanup(dev); 2897 2897 mlx5_nic_vport_disable_roce(dev->mdev); 2898 2898 } 2899 2899 ··· 3199 3199 spin_lock_init(&dev->reset_flow_resource_lock); 3200 3200 3201 3201 if (ll == IB_LINK_LAYER_ETHERNET) { 3202 - err = mlx5_enable_roce(dev); 3202 + err = mlx5_enable_eth(dev); 3203 3203 if (err) 3204 3204 goto err_dealloc; 3205 3205 } 3206 3206 3207 3207 err = create_dev_resources(&dev->devr); 3208 3208 if (err) 3209 - goto err_disable_roce; 3209 + goto err_disable_eth; 3210 3210 3211 3211 err = mlx5_ib_odp_init_one(dev); 3212 3212 if (err) ··· 3250 3250 err_rsrc: 3251 3251 destroy_dev_resources(&dev->devr); 3252 3252 3253 - err_disable_roce: 3253 + err_disable_eth: 3254 3254 if (ll == IB_LINK_LAYER_ETHERNET) { 3255 - mlx5_disable_roce(dev); 3255 + mlx5_disable_eth(dev); 3256 3256 mlx5_remove_netdev_notifier(dev); 3257 3257 } 3258 3258 ··· 3277 3277 mlx5_ib_odp_remove_one(dev); 3278 3278 destroy_dev_resources(&dev->devr); 3279 3279 if (ll == IB_LINK_LAYER_ETHERNET) 3280 - mlx5_disable_roce(dev); 3280 + mlx5_disable_eth(dev); 3281 3281 kfree(dev->port); 3282 3282 ib_dealloc_device(&dev->ib_dev); 3283 3283 }