drop queue-5.8/bnxt_en-check-for-zero-dir-entries-in-nvram.patch

already applied...

diff --git a/queue-5.8/bnxt_en-check-for-zero-dir-entries-in-nvram.patch b/queue-5.8/bnxt_en-check-for-zero-dir-entries-in-nvram.patch
deleted file mode 100644 (file)
index 6245c36..0000000
--- a/queue-5.8/bnxt_en-check-for-zero-dir-entries-in-nvram.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From foo@baz Fri Sep 11 09:06:45 AM CEST 2020
-From: Vasundhara Volam <vasundhara-v.volam@broadcom.com>
-Date: Wed, 26 Aug 2020 01:08:33 -0400
-Subject: bnxt_en: Check for zero dir entries in NVRAM.
-
-From: Vasundhara Volam <vasundhara-v.volam@broadcom.com>
-
-[ Upstream commit dbbfa96ad920c50d58bcaefa57f5f33ceef9d00e ]
-
-If firmware goes into unstable state, HWRM_NVM_GET_DIR_INFO firmware
-command may return zero dir entries. Return error in such case to
-avoid zero length dma buffer request.
-
-Fixes: c0c050c58d84 ("bnxt_en: New Broadcom ethernet driver.")
-Signed-off-by: Vasundhara Volam <vasundhara-v.volam@broadcom.com>
-Signed-off-by: Michael Chan <michael.chan@broadcom.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c |    3 +++
- 1 file changed, 3 insertions(+)
-
---- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
-+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
-@@ -2266,6 +2266,9 @@ static int bnxt_get_nvram_directory(stru
-       if (!dir_entries || !entry_length)
-               return -EIO;
- 
-+      if (!dir_entries || !entry_length)
-+              return -EIO;
-+
-       /* Insert 2 bytes of directory info (count and size of entries) */
-       if (len < 2)
-               return -EINVAL;

diff --git a/queue-5.8/series b/queue-5.8/series
index 68859cb57f36e0f1752f7603b615006bd4210062..527ec5c3af23d9c807474e7201a1c327a5f36327 100644 (file)
--- a/queue-5.8/series
+++ b/queue-5.8/series
@@ -13,5 +13,4 @@ taprio-fix-using-wrong-queues-in-gate-mask.patch
 tipc-fix-shutdown-of-connectionless-socket.patch
 tipc-fix-using-smp_processor_id-in-preemptible.patch
 net-disable-netpoll-on-fresh-napis.patch
-bnxt_en-check-for-zero-dir-entries-in-nvram.patch
 mptcp-free-acked-data-before-waiting-for-more-memory.patch