drop queue-4.19/ibmvnic-notify-peers-when-failover-and-migration-happen.patch

diff --git a/queue-4.19/ibmvnic-ensure-that-scrq-entry-reads-are-correctly-ordered.patch b/queue-4.19/ibmvnic-ensure-that-scrq-entry-reads-are-correctly-ordered.patch
index ba27f2b5210880f58d6e823305fc291b36f363d3..223ac9c3a54a0617d6c229c464e6838641ecf13b 100644 (file)
--- a/queue-4.19/ibmvnic-ensure-that-scrq-entry-reads-are-correctly-ordered.patch
+++ b/queue-4.19/ibmvnic-ensure-that-scrq-entry-reads-are-correctly-ordered.patch
@@ -25,7 +25,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 --- a/drivers/net/ethernet/ibm/ibmvnic.c
 +++ b/drivers/net/ethernet/ibm/ibmvnic.c
-@@ -2162,6 +2162,12 @@ restart_poll:
+@@ -2158,6 +2158,12 @@ restart_poll:
  
                if (!pending_scrq(adapter, adapter->rx_scrq[scrq_num]))
                        break;
@@ -38,7 +38,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
                next = ibmvnic_next_scrq(adapter, adapter->rx_scrq[scrq_num]);
                rx_buff =
                    (struct ibmvnic_rx_buff *)be64_to_cpu(next->
-@@ -2784,6 +2790,13 @@ restart_loop:
+@@ -2780,6 +2786,13 @@ restart_loop:
                unsigned int pool = scrq->pool_index;
                int num_entries = 0;
  
@@ -52,7 +52,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
                next = ibmvnic_next_scrq(adapter, scrq);
                for (i = 0; i < next->tx_comp.num_comps; i++) {
                        if (next->tx_comp.rcs[i]) {
-@@ -3180,6 +3193,11 @@ static union sub_crq *ibmvnic_next_scrq(
+@@ -3176,6 +3189,11 @@ static union sub_crq *ibmvnic_next_scrq(
        }
        spin_unlock_irqrestore(&scrq->lock, flags);
  

diff --git a/queue-4.19/ibmvnic-fix-tx-completion-error-handling.patch b/queue-4.19/ibmvnic-fix-tx-completion-error-handling.patch
index 9fe82a57d1aa32628995ee8098244044347c68ec..60f15c908500fd3e5a7088364dc4b8cf44411bb0 100644 (file)
--- a/queue-4.19/ibmvnic-fix-tx-completion-error-handling.patch
+++ b/queue-4.19/ibmvnic-fix-tx-completion-error-handling.patch
@@ -22,7 +22,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 --- a/drivers/net/ethernet/ibm/ibmvnic.c
 +++ b/drivers/net/ethernet/ibm/ibmvnic.c
-@@ -2799,11 +2799,9 @@ restart_loop:
+@@ -2795,11 +2795,9 @@ restart_loop:
  
                next = ibmvnic_next_scrq(adapter, scrq);
                for (i = 0; i < next->tx_comp.num_comps; i++) {

diff --git a/queue-4.19/ibmvnic-notify-peers-when-failover-and-migration-happen.patch b/queue-4.19/ibmvnic-notify-peers-when-failover-and-migration-happen.patch
deleted file mode 100644 (file)
index 86ff6a7..0000000
--- a/queue-4.19/ibmvnic-notify-peers-when-failover-and-migration-happen.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From foo@baz Wed Dec  2 11:19:34 AM CET 2020
-From: Lijun Pan <ljp@linux.ibm.com>
-Date: Fri, 20 Nov 2020 16:40:12 -0600
-Subject: ibmvnic: notify peers when failover and migration happen
-
-From: Lijun Pan <ljp@linux.ibm.com>
-
-[ Upstream commit 98025bce3a6200a0c4637272a33b5913928ba5b8 ]
-
-Commit 61d3e1d9bc2a ("ibmvnic: Remove netdev notify for failover resets")
-excluded the failover case for notify call because it said
-netdev_notify_peers() can cause network traffic to stall or halt.
-Current testing does not show network traffic stall
-or halt because of the notify call for failover event.
-netdev_notify_peers may be used when a device wants to inform the
-rest of the network about some sort of a reconfiguration
-such as failover or migration.
-
-It is unnecessary to call that in other events like
-FATAL, NON_FATAL, CHANGE_PARAM, and TIMEOUT resets
-since in those scenarios the hardware does not change.
-If the driver must do a hard reset, it is necessary to notify peers.
-
-Fixes: 61d3e1d9bc2a ("ibmvnic: Remove netdev notify for failover resets")
-Suggested-by: Brian King <brking@linux.vnet.ibm.com>
-Suggested-by: Pradeep Satyanarayana <pradeeps@linux.vnet.ibm.com>
-Signed-off-by: Dany Madden <drt@linux.ibm.com>
-Signed-off-by: Lijun Pan <ljp@linux.ibm.com>
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/net/ethernet/ibm/ibmvnic.c |    8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
---- a/drivers/net/ethernet/ibm/ibmvnic.c
-+++ b/drivers/net/ethernet/ibm/ibmvnic.c
-@@ -1877,8 +1877,9 @@ static int do_reset(struct ibmvnic_adapt
-       for (i = 0; i < adapter->req_rx_queues; i++)
-               napi_schedule(&adapter->napi[i]);
- 
--      if (adapter->reset_reason != VNIC_RESET_FAILOVER &&
--          adapter->reset_reason != VNIC_RESET_CHANGE_PARAM) {
-+      if ((adapter->reset_reason != VNIC_RESET_FAILOVER &&
-+           adapter->reset_reason != VNIC_RESET_CHANGE_PARAM) ||
-+           adapter->reset_reason == VNIC_RESET_MOBILITY) {
-               call_netdevice_notifiers(NETDEV_NOTIFY_PEERS, netdev);
-               call_netdevice_notifiers(NETDEV_RESEND_IGMP, netdev);
-       }
-@@ -2106,6 +2107,9 @@ static int ibmvnic_reset(struct ibmvnic_
-       netdev_dbg(adapter->netdev, "Scheduling reset (reason %d)\n", reason);
-       schedule_work(&adapter->ibmvnic_reset);
- 
-+      call_netdevice_notifiers(NETDEV_NOTIFY_PEERS, netdev);
-+      call_netdevice_notifiers(NETDEV_RESEND_IGMP, netdev);
-+
-       return 0;
- err:
-       if (adapter->wait_for_reset)

diff --git a/queue-4.19/series b/queue-4.19/series
index 357037dc6f138d67a0cd93d2ba34e3c76713f161..3cca35154f45d4483a9b0437a3b3039a3ddfd87a 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -8,7 +8,6 @@ tun-honor-iocb_nowait-flag.patch
 usbnet-ipheth-fix-connectivity-with-ios-14.patch
 net-tls-protect-from-calling-tls_dev_del-for-tls-rx-twice.patch
 ibmvnic-fix-call_netdevice_notifiers-in-do_reset.patch
-ibmvnic-notify-peers-when-failover-and-migration-happen.patch
 i40e-fix-removing-driver-while-bare-metal-vfs-pass-traffic.patch
 bonding-wait-for-sysfs-kobject-destruction-before-freeing-struct-slave.patch
 netfilter-bridge-reset-skb-pkt_type-after-nf_inet_post_routing-traversal.patch