IB/mlx5: Refactor registration to netdev notifier

Refactor the netdev notifier registration into a small helper function.

This is a pre-step towards having mlx5 IB device over an Ethernet port
which doesn't support RoCE. Also, renamed the de-registration helper
and the new helper as netdev notifier and not roce, to make it clear
this is not only used with 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>

diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c
index 7e5b803617240be17809825c0830ea676ed4ec2d..0ee1e4ab02fad559fc4a73ef481e698054692b6f 100644 (file)
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@ -2843,7 +2843,21 @@ static void mlx5_roce_lag_cleanup(struct mlx5_ib_dev *dev)
        }
 }
 
-static void mlx5_remove_roce_notifier(struct mlx5_ib_dev *dev)
+static int mlx5_add_netdev_notifier(struct mlx5_ib_dev *dev)
+{
+       int err;
+
+       dev->roce.nb.notifier_call = mlx5_netdev_event;
+       err = register_netdevice_notifier(&dev->roce.nb);
+       if (err) {
+               dev->roce.nb.notifier_call = NULL;
+               return err;
+       }
+
+       return 0;
+}
+
+static void mlx5_remove_netdev_notifier(struct mlx5_ib_dev *dev)
 {
        if (dev->roce.nb.notifier_call) {
                unregister_netdevice_notifier(&dev->roce.nb);
@@ -2855,12 +2869,9 @@ static int mlx5_enable_roce(struct mlx5_ib_dev *dev)
 {
        int err;
 
-       dev->roce.nb.notifier_call = mlx5_netdev_event;
-       err = register_netdevice_notifier(&dev->roce.nb);
-       if (err) {
-               dev->roce.nb.notifier_call = NULL;
+       err = mlx5_add_netdev_notifier(dev);
+       if (err)
                return err;
-       }
 
        err = mlx5_nic_vport_enable_roce(dev->mdev);
        if (err)
@@ -2876,7 +2887,7 @@ err_disable_roce:
        mlx5_nic_vport_disable_roce(dev->mdev);
 
 err_unregister_netdevice_notifier:
-       mlx5_remove_roce_notifier(dev);
+       mlx5_remove_netdev_notifier(dev);
        return err;
 }
 
@@ -3242,7 +3253,7 @@ err_rsrc:
 err_disable_roce:
        if (ll == IB_LINK_LAYER_ETHERNET) {
                mlx5_disable_roce(dev);
-               mlx5_remove_roce_notifier(dev);
+               mlx5_remove_netdev_notifier(dev);
        }
 
 err_free_port:
@@ -3259,7 +3270,7 @@ static void mlx5_ib_remove(struct mlx5_core_dev *mdev, void *context)
        struct mlx5_ib_dev *dev = context;
        enum rdma_link_layer ll = mlx5_ib_port_link_layer(&dev->ib_dev, 1);
 
-       mlx5_remove_roce_notifier(dev);
+       mlx5_remove_netdev_notifier(dev);
        ib_unregister_device(&dev->ib_dev);
        mlx5_ib_dealloc_q_counters(dev);
        destroy_umrc_res(dev);