Commit ef5617e3 authored by Petr Pavlu's avatar Petr Pavlu Committed by David S. Miller

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: default avatarPetr Pavlu <petr.pavlu@suse.com>
Tested-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Reviewed-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Acked-by: default avatarTariq Toukan <tariqt@nvidia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 71ab55a9
...@@ -235,8 +235,8 @@ static void mlx4_en_remove(struct mlx4_dev *dev, void *endev_ptr) ...@@ -235,8 +235,8 @@ static void mlx4_en_remove(struct mlx4_dev *dev, void *endev_ptr)
iounmap(mdev->uar_map); iounmap(mdev->uar_map);
mlx4_uar_free(dev, &mdev->priv_uar); mlx4_uar_free(dev, &mdev->priv_uar);
mlx4_pd_free(dev, mdev->priv_pdn); mlx4_pd_free(dev, mdev->priv_pdn);
if (mdev->nb.notifier_call) if (mdev->netdev_nb.notifier_call)
unregister_netdevice_notifier(&mdev->nb); unregister_netdevice_notifier(&mdev->netdev_nb);
kfree(mdev); kfree(mdev);
} }
...@@ -252,11 +252,11 @@ static void mlx4_en_activate(struct mlx4_dev *dev, void *ctx) ...@@ -252,11 +252,11 @@ static void mlx4_en_activate(struct mlx4_dev *dev, void *ctx)
mdev->pndev[i] = NULL; mdev->pndev[i] = NULL;
} }
/* register notifier */ /* register netdev notifier */
mdev->nb.notifier_call = mlx4_en_netdev_event; mdev->netdev_nb.notifier_call = mlx4_en_netdev_event;
if (register_netdevice_notifier(&mdev->nb)) { if (register_netdevice_notifier(&mdev->netdev_nb)) {
mdev->nb.notifier_call = NULL; mdev->netdev_nb.notifier_call = NULL;
mlx4_err(mdev, "Failed to create notifier\n"); mlx4_err(mdev, "Failed to create netdev notifier\n");
} }
} }
......
...@@ -2967,7 +2967,7 @@ int mlx4_en_netdev_event(struct notifier_block *this, ...@@ -2967,7 +2967,7 @@ int mlx4_en_netdev_event(struct notifier_block *this,
if (!net_eq(dev_net(ndev), &init_net)) if (!net_eq(dev_net(ndev), &init_net))
return NOTIFY_DONE; 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; dev = mdev->dev;
/* Go into this mode only when two network devices set on two ports /* Go into this mode only when two network devices set on two ports
......
...@@ -432,7 +432,7 @@ struct mlx4_en_dev { ...@@ -432,7 +432,7 @@ struct mlx4_en_dev {
unsigned long last_overflow_check; unsigned long last_overflow_check;
struct ptp_clock *ptp_clock; struct ptp_clock *ptp_clock;
struct ptp_clock_info ptp_clock_info; struct ptp_clock_info ptp_clock_info;
struct notifier_block nb; struct notifier_block netdev_nb;
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment