[gentoo-commits] proj/linux-patches:5.10 commit in: /

[Mike Pagano]

commit:     21d8468bad975398075cf6fba790c8d416f45a32
Author:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 14 16:30:45 2021 +0000
Commit:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
CommitDate: Wed Jul 14 16:30:45 2021 +0000
URL:        https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=21d8468b

Remove redundant patch

Removed:
2400_revert-ibmvnic-remove-duplicate-napi_schedule-call-i.patch

Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org>

 0000_README                                        |  4 --
 ...nic-remove-duplicate-napi_schedule-call-i.patch | 46 ----------------------
 2 files changed, 50 deletions(-)

diff --git a/0000_README b/0000_README
index e9246be..e40d4fd 100644
--- a/0000_README
+++ b/0000_README
@@ -255,10 +255,6 @@ Patch:  2000_BT-Check-key-sizes-only-if-Secure-Simple-Pairing-enabled.patch
 From:   https://lore.kernel.org/linux-bluetooth/20190522070540.48895-1-marcel@××××××××.org/raw
 Desc:   Bluetooth: Check key sizes only when Secure Simple Pairing is enabled. See bug #686758
 
-Patch:  2400_revert-ibmvnic-remove-duplicate-napi_schedule-call-i.patch
-From:   https://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git/plain/queue-5.10/revert-ibmvnic-remove-duplicate-napi_schedule-call-i.patch
-Desc:   Revert ibmvnic: remove duplicate napi_schedule call in open function
-
 Patch:  2900_tmp513-Fix-build-issue-by-selecting-CONFIG_REG.patch
 From:   https://bugs.gentoo.org/710790
 Desc:   tmp513 requies REGMAP_I2C to build.  Select it by default in Kconfig. See bug #710790. Thanks to Phil Stracchino

diff --git a/2400_revert-ibmvnic-remove-duplicate-napi_schedule-call-i.patch b/2400_revert-ibmvnic-remove-duplicate-napi_schedule-call-i.patch
deleted file mode 100644
index 6acd432..0000000
--- a/2400_revert-ibmvnic-remove-duplicate-napi_schedule-call-i.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From a795f695bbc648e27d56f99c38fc1afbe832b088 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@××××××.org>
-Date: Wed, 23 Jun 2021 21:13:11 -0700
-Subject: Revert "ibmvnic: remove duplicate napi_schedule call in open
- function"
-
-From: Dany Madden <drt@×××××××××.com>
-
-[ Upstream commit 2ca220f92878470c6ba03f9946e412323093cc94 ]
-
-This reverts commit 7c451f3ef676c805a4b77a743a01a5c21a250a73.
-
-When a vnic interface is taken down and then up, connectivity is not
-restored. We bisected it to this commit. Reverting this commit until
-we can fully investigate the issue/benefit of the change.
-
-Fixes: 7c451f3ef676 ("ibmvnic: remove duplicate napi_schedule call in open function")
-Reported-by: Cristobal Forno <cforno12@×××××××××.com>
-Reported-by: Abdul Haleem <abdhalee@××××××.com>
-Signed-off-by: Dany Madden <drt@×××××××××.com>
-Signed-off-by: Sukadev Bhattiprolu <sukadev@×××××××××.com>
-Signed-off-by: David S. Miller <davem@×××××××××.net>
-Signed-off-by: Sasha Levin <sashal@××××××.org>
----
- drivers/net/ethernet/ibm/ibmvnic.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
-index 8cc444684491..765b38c8b252 100644
---- a/drivers/net/ethernet/ibm/ibmvnic.c
-+++ b/drivers/net/ethernet/ibm/ibmvnic.c
-@@ -1166,6 +1166,11 @@ static int __ibmvnic_open(struct net_device *netdev)
- 
- 	netif_tx_start_all_queues(netdev);
- 
-+	if (prev_state == VNIC_CLOSED) {
-+		for (i = 0; i < adapter->req_rx_queues; i++)
-+			napi_schedule(&adapter->napi[i]);
-+	}
-+
- 	adapter->state = VNIC_OPEN;
- 	return rc;
- }
--- 
-2.30.2
-