drop ibmvnic-check-failover_pending-in-login-response.patch from 4.9 and 4.14

diff --git a/queue-4.14/ibmvnic-check-failover_pending-in-login-response.patch b/queue-4.14/ibmvnic-check-failover_pending-in-login-response.patch
deleted file mode 100644 (file)
index 7f70dfe..0000000
--- a/queue-4.14/ibmvnic-check-failover_pending-in-login-response.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 273c29e944bda9a20a30c26cfc34c9a3f363280b Mon Sep 17 00:00:00 2001
-From: Sukadev Bhattiprolu <sukadev@linux.ibm.com>
-Date: Wed, 8 Sep 2021 09:58:20 -0700
-Subject: ibmvnic: check failover_pending in login response
-
-From: Sukadev Bhattiprolu <sukadev@linux.ibm.com>
-
-commit 273c29e944bda9a20a30c26cfc34c9a3f363280b upstream.
-
-If a failover occurs before a login response is received, the login
-response buffer maybe undefined. Check that there was no failover
-before accessing the login response buffer.
-
-Fixes: 032c5e82847a ("Driver for IBM System i/p VNIC protocol")
-Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.ibm.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/net/ethernet/ibm/ibmvnic.c |    8 ++++++++
- 1 file changed, 8 insertions(+)
-
---- a/drivers/net/ethernet/ibm/ibmvnic.c
-+++ b/drivers/net/ethernet/ibm/ibmvnic.c
-@@ -3965,6 +3965,14 @@ static int ibmvnic_probe(struct vio_dev
-                       goto ibmvnic_init_fail;
-       } while (rc == EAGAIN);
- 
-+      if (adapter->failover_pending) {
-+              adapter->init_done_rc = -EAGAIN;
-+              netdev_dbg(netdev, "Failover pending, ignoring login response\n");
-+              complete(&adapter->init_done);
-+              /* login response buffer will be released on reset */
-+              return 0;
-+      }
-+
-       netdev->mtu = adapter->req_mtu - ETH_HLEN;
- 
-       rc = device_create_file(&dev->dev, &dev_attr_failover);

diff --git a/queue-4.14/series b/queue-4.14/series
index f7bc00efa43b2b9c65cc927c9b69b142bde897cd..019bac67968e36338067ed6e96bc8a450f163ee8 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -201,7 +201,6 @@ tipc-increase-timeout-in-tipc_sk_enqueue.patch
 events-reuse-value-read-using-read_once-instead-of-re-reading-it.patch
 net-af_unix-fix-a-data-race-in-unix_dgram_poll.patch
 tcp-fix-tp-undo_retrans-accounting-in-tcp_sacktag_one.patch
-ibmvnic-check-failover_pending-in-login-response.patch
 mm-memory_hotplug-use-unsigned-long-for-pfn-in-zone_for_pfn_range.patch
 dt-bindings-mtd-gpmc-fix-the-ecc-bytes-vs.-oob-bytes.patch
 mfd-don-t-use-irq_create_mapping-to-resolve-a-mappin.patch

diff --git a/queue-4.9/ibmvnic-check-failover_pending-in-login-response.patch b/queue-4.9/ibmvnic-check-failover_pending-in-login-response.patch
deleted file mode 100644 (file)
index 5aa07ab..0000000
--- a/queue-4.9/ibmvnic-check-failover_pending-in-login-response.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 273c29e944bda9a20a30c26cfc34c9a3f363280b Mon Sep 17 00:00:00 2001
-From: Sukadev Bhattiprolu <sukadev@linux.ibm.com>
-Date: Wed, 8 Sep 2021 09:58:20 -0700
-Subject: ibmvnic: check failover_pending in login response
-
-From: Sukadev Bhattiprolu <sukadev@linux.ibm.com>
-
-commit 273c29e944bda9a20a30c26cfc34c9a3f363280b upstream.
-
-If a failover occurs before a login response is received, the login
-response buffer maybe undefined. Check that there was no failover
-before accessing the login response buffer.
-
-Fixes: 032c5e82847a ("Driver for IBM System i/p VNIC protocol")
-Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.ibm.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/net/ethernet/ibm/ibmvnic.c |    8 ++++++++
- 1 file changed, 8 insertions(+)
-
---- a/drivers/net/ethernet/ibm/ibmvnic.c
-+++ b/drivers/net/ethernet/ibm/ibmvnic.c
-@@ -2527,6 +2527,14 @@ static int handle_login_rsp(union ibmvni
-               return 0;
-       }
- 
-+      if (adapter->failover_pending) {
-+              adapter->init_done_rc = -EAGAIN;
-+              netdev_dbg(netdev, "Failover pending, ignoring login response\n");
-+              complete(&adapter->init_done);
-+              /* login response buffer will be released on reset */
-+              return 0;
-+      }
-+
-       netdev_dbg(adapter->netdev, "Login Response Buffer:\n");
-       for (i = 0; i < (adapter->login_rsp_buf_sz - 1) / 8 + 1; i++) {
-               netdev_dbg(adapter->netdev, "%016lx\n",

diff --git a/queue-4.9/series b/queue-4.9/series
index e7b8a5da2262c0b147f33ddb5755507ae5aece53..f274789706f8e1ab0b1d5614d949fa7a6a87964e 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -161,7 +161,6 @@ tipc-increase-timeout-in-tipc_sk_enqueue.patch
 events-reuse-value-read-using-read_once-instead-of-re-reading-it.patch
 net-af_unix-fix-a-data-race-in-unix_dgram_poll.patch
 tcp-fix-tp-undo_retrans-accounting-in-tcp_sacktag_one.patch
-ibmvnic-check-failover_pending-in-login-response.patch
 x86-mm-fix-kern_addr_valid-to-cope-with-existing-but-not-present-entries.patch
 dt-bindings-mtd-gpmc-fix-the-ecc-bytes-vs.-oob-bytes.patch
 mfd-don-t-use-irq_create_mapping-to-resolve-a-mappin.patch