mlx4: Rename member mlx4_en_dev.nb to netdev_nb

Rename the mlx4_en_dev.nb notifier_block member to netdev_nb in
preparation to add a mlx4 core notifier_block.

Signed-off-by: Petr Pavlu <petr.pavlu@suse.com>
Tested-by: Leon Romanovsky <leonro@nvidia.com>
Reviewed-by: Leon Romanovsky <leonro@nvidia.com>
Acked-by: Tariq Toukan <tariqt@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mellanox/mlx4/en_main.c b/drivers/net/ethernet/mellanox/mlx4/en_main.c
index 6a42bec..be8ba34 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx4/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_main.c
@@ -235,8 +235,8 @@ static void mlx4_en_remove(struct mlx4_dev *dev, void *endev_ptr)
        iounmap(mdev->uar_map);
        mlx4_uar_free(dev, &mdev->priv_uar);
        mlx4_pd_free(dev, mdev->priv_pdn);
-       if (mdev->nb.notifier_call)
-               unregister_netdevice_notifier(&mdev->nb);
+       if (mdev->netdev_nb.notifier_call)
+               unregister_netdevice_notifier(&mdev->netdev_nb);
        kfree(mdev);
 }
 
@@ -252,11 +252,11 @@ static void mlx4_en_activate(struct mlx4_dev *dev, void *ctx)
                        mdev->pndev[i] = NULL;
        }
 
-       /* register notifier */
-       mdev->nb.notifier_call = mlx4_en_netdev_event;
-       if (register_netdevice_notifier(&mdev->nb)) {
-               mdev->nb.notifier_call = NULL;
-               mlx4_err(mdev, "Failed to create notifier\n");
+       /* register netdev notifier */
+       mdev->netdev_nb.notifier_call = mlx4_en_netdev_event;
+       if (register_netdevice_notifier(&mdev->netdev_nb)) {
+               mdev->netdev_nb.notifier_call = NULL;
+               mlx4_err(mdev, "Failed to create netdev notifier\n");
        }
 }
 

diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
index 403604c..7066c42 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
@@ -2967,7 +2967,7 @@ int mlx4_en_netdev_event(struct notifier_block *this,
        if (!net_eq(dev_net(ndev), &init_net))
                return NOTIFY_DONE;
 
-       mdev = container_of(this, struct mlx4_en_dev, nb);
+       mdev = container_of(this, struct mlx4_en_dev, netdev_nb);
        dev = mdev->dev;
 
        /* Go into this mode only when two network devices set on two ports

diff --git a/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h b/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
index 321f801..72a3fea 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
+++ b/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
@@ -432,7 +432,7 @@ struct mlx4_en_dev {
        unsigned long           last_overflow_check;
        struct ptp_clock        *ptp_clock;
        struct ptp_clock_info   ptp_clock_info;
-       struct notifier_block   nb;
+       struct notifier_block   netdev_nb;
 };