[PATCH net] net/mlx4_en: Fixed crash when port type is changed

[PATCH net] net/mlx4_en: Fixed crash when port type is changed

[Amir Vadai]

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>
---
Please pull into -stable for kernels >= 3.10

 drivers/net/ethernet/mellanox/mlx4/en_main.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/mellanox/mlx4/en_main.c b/drivers/net/ethernet/mellanox/mlx4/en_main.c
index a071cda..0d087b0 100644
--- 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 *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 *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:
-- 
1.8.3.4

Re: [PATCH net] net/mlx4_en: Fixed crash when port type is changed

[David Miller]

From: Amir Vadai <amirv@mellanox.com>
Date: Thu,  7 Nov 2013 11:08:30 +0200

> 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>
> ---
> Please pull into -stable for kernels >= 3.10

Applied and queued up for -stable, thanks.

Re: [PATCH net] net/mlx4_en: Fixed crash when port type is changed

[Amir Vadai]

On 07/11/13 19:14 -0500, David Miller wrote:
> From: Amir Vadai <amirv@mellanox.com>
> Date: Thu,  7 Nov 2013 11:08:30 +0200
> 
> > 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>
> > ---
> > Please pull into -stable for kernels >= 3.10
> 
> Applied and queued up for -stable, thanks.

Hi,

I see that this patch [1] was applied to 3.10.y and 3.12.y.
But somehow it was dropped from 3.11.y
Please pull it there too.

Thanks,
Amir

[1] - 1ec4864 net/mlx4_en: Fixed crash when port type is changed

Re: [PATCH net] net/mlx4_en: Fixed crash when port type is changed

[Govindarajulu Varadarajan]

On Sun, 16 Feb 2014, Amir Vadai wrote:

> On 07/11/13 19:14 -0500, David Miller wrote:
>> From: Amir Vadai <amirv@mellanox.com>
>> Date: Thu,  7 Nov 2013 11:08:30 +0200
>>
>>> 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>
>>> ---
>>> Please pull into -stable for kernels >= 3.10
>>
>> Applied and queued up for -stable, thanks.
>
> Hi,
>
> I see that this patch [1] was applied to 3.10.y and 3.12.y.
> But somehow it was dropped from 3.11.y
> Please pull it there too.
>

I think 3.11 is EOL. Check https://www.kernel.org/

//govind

> Thanks,
> Amir
>
> [1] - 1ec4864 net/mlx4_en: Fixed crash when port type is changed
> --
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>

Re: net/mlx4_en: Fixed crash when port type is changed

[Amir Vadai]

On 16/02/14 16:25 +0530, Govindarajulu Varadarajan wrote:
> 
> I think 3.11 is EOL. Check https://www.kernel.org/
> 
> //govind
> 

Oh - missed it.

Thanks,
Amir