| From 1e7b211c28959af942642d25d6e1917de0163ca0 Mon Sep 17 00:00:00 2001 |
| From: Amir Vadai <amirv@mellanox.com> |
| Date: Thu, 7 Nov 2013 11:08:30 +0200 |
| Subject: net/mlx4_en: Fixed crash when port type is changed |
| |
| From: Amir Vadai <amirv@mellanox.com> |
| |
| [ Upstream commit 1ec4864b10171b0691ee196d7006ae56d2c153f2 ] |
| |
| timecounter_init() was was called only after first potential |
| timecounter_read(). |
| Moved mlx4_en_init_timestamp() before mlx4_en_init_netdev() |
| |
| Signed-off-by: Amir Vadai <amirv@mellanox.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/net/ethernet/mellanox/mlx4/en_main.c | 8 ++++---- |
| 1 file changed, 4 insertions(+), 4 deletions(-) |
| |
| --- a/drivers/net/ethernet/mellanox/mlx4/en_main.c |
| +++ b/drivers/net/ethernet/mellanox/mlx4/en_main.c |
| @@ -264,6 +264,10 @@ static void *mlx4_en_add(struct mlx4_dev |
| mlx4_foreach_port(i, dev, MLX4_PORT_TYPE_ETH) |
| mdev->port_cnt++; |
| |
| + /* Initialize time stamp mechanism */ |
| + if (mdev->dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_TS) |
| + mlx4_en_init_timestamp(mdev); |
| + |
| mlx4_foreach_port(i, dev, MLX4_PORT_TYPE_ETH) { |
| if (!dev->caps.comp_pool) { |
| mdev->profile.prof[i].rx_ring_num = |
| @@ -301,10 +305,6 @@ static void *mlx4_en_add(struct mlx4_dev |
| mdev->pndev[i] = NULL; |
| } |
| |
| - /* Initialize time stamp mechanism */ |
| - if (mdev->dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_TS) |
| - mlx4_en_init_timestamp(mdev); |
| - |
| return mdev; |
| |
| err_mr: |
