remove queue-4.4/net-mlx5-fix-driver-load-bad-flow-when-having-fw-initializing-timeou...

diff --git a/queue-4.4/net-mlx5-fix-driver-load-bad-flow-when-having-fw-initializing-timeout.patch b/queue-4.4/net-mlx5-fix-driver-load-bad-flow-when-having-fw-initializing-timeout.patch
deleted file mode 100644 (file)
index 9398bbc..0000000
--- a/queue-4.4/net-mlx5-fix-driver-load-bad-flow-when-having-fw-initializing-timeout.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From foo@baz Sun Apr 30 15:46:17 CEST 2017
-From: Mohamad Haj Yahia <mohamad@mellanox.com>
-Date: Thu, 30 Mar 2017 17:00:25 +0300
-Subject: net/mlx5: Fix driver load bad flow when having fw initializing timeout
-
-From: Mohamad Haj Yahia <mohamad@mellanox.com>
-
-
-[ Upstream commit 55378a238e04b39cc82957d91d16499704ea719b ]
-
-If FW is stuck in initializing state we will skip the driver load, but
-current error handling flow doesn't clean previously allocated command
-interface resources.
-
-Fixes: e3297246c2c8 ('net/mlx5_core: Wait for FW readiness on startup')
-Signed-off-by: Mohamad Haj Yahia <mohamad@mellanox.com>
-Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/net/ethernet/mellanox/mlx5/core/main.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/net/ethernet/mellanox/mlx5/core/main.c
-+++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c
-@@ -944,7 +944,7 @@ static int mlx5_load_one(struct mlx5_cor
-       if (err) {
-               dev_err(&dev->pdev->dev, "Firmware over %d MS in initializing state, aborting\n",
-                       FW_INIT_TIMEOUT_MILI);
--              goto out_err;
-+              goto err_cmd_cleanup;
-       }
- 
-       mlx5_pagealloc_init(dev);

diff --git a/queue-4.4/series b/queue-4.4/series
index 419d4f43a85c92ff0678038ea50ddebcd60e1aba..f34189fe6a5de57503eff9dcd7b141cd5d9cdf80 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -29,7 +29,6 @@ dp83640-don-t-recieve-time-stamps-twice.patch
 net-ipv6-rtf_pcpu-should-not-be-settable-from-userspace.patch
 netpoll-check-for-skb-queue_mapping.patch
 ip6mr-fix-notification-device-destruction.patch
-net-mlx5-fix-driver-load-bad-flow-when-having-fw-initializing-timeout.patch
 macvlan-fix-device-ref-leak-when-purging-bc_queue.patch
 ipv6-check-skb-protocol-before-lookup-for-nexthop.patch
 ipv6-check-raw-payload-size-correctly-in-ioctl.patch