diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-11-02 10:09:38 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-11-02 10:09:38 -0400 |
| commit | c70407a22010463bfe8fec462cfe4d96ce7e95aa (patch) | |
| tree | b9650c366e781604bbfed9f40041a7c03ed7f6cc | |
| parent | 2a9df0acb5d7abfc1553cdadc2211bac058c8858 (diff) | |
| download | longterm-queue-4.8-c70407a22010463bfe8fec462cfe4d96ce7e95aa.tar.gz | |
mellanox: trivial context refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/net-mlx5-Fix-driver-load-bad-flow-when-having-fw-ini.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/queue/net-mlx5-Fix-driver-load-bad-flow-when-having-fw-ini.patch b/queue/net-mlx5-Fix-driver-load-bad-flow-when-having-fw-ini.patch index 265b041..ba11229 100644 --- a/queue/net-mlx5-Fix-driver-load-bad-flow-when-having-fw-ini.patch +++ b/queue/net-mlx5-Fix-driver-load-bad-flow-when-having-fw-ini.patch @@ -1,4 +1,4 @@ -From 55378a238e04b39cc82957d91d16499704ea719b Mon Sep 17 00:00:00 2001 +From 08f5ee36c33f5d3377b0e63581ae4967553ee28f Mon Sep 17 00:00:00 2001 From: Mohamad Haj Yahia <mohamad@mellanox.com> Date: Thu, 30 Mar 2017 17:00:25 +0300 Subject: [PATCH] net/mlx5: Fix driver load bad flow when having fw @@ -15,10 +15,10 @@ Signed-off-by: Mohamad Haj Yahia <mohamad@mellanox.com> Signed-off-by: Saeed Mahameed <saeedm@mellanox.com> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/main.c b/drivers/net/ethernet/mellanox/mlx5/core/main.c -index 60154a175bd3..0ad66324247f 100644 +index 3bdc8ffca99c..c755896bb170 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c -@@ -1029,7 +1029,7 @@ static int mlx5_load_one(struct mlx5_core_dev *dev, struct mlx5_priv *priv, +@@ -1032,7 +1032,7 @@ static int mlx5_load_one(struct mlx5_core_dev *dev, struct mlx5_priv *priv) if (err) { dev_err(&dev->pdev->dev, "Firmware over %d MS in initializing state, aborting\n", FW_INIT_TIMEOUT_MILI); @@ -26,7 +26,7 @@ index 60154a175bd3..0ad66324247f 100644 + goto err_cmd_cleanup; } - err = mlx5_core_enable_hca(dev, 0); + mlx5_pagealloc_init(dev); -- 2.12.0 |