4.14-stable patches

added patches:
	eth-sun-cassini-remove-dead-code.patch

diff --git a/queue-4.14/eth-sun-cassini-remove-dead-code.patch b/queue-4.14/eth-sun-cassini-remove-dead-code.patch
new file mode 100644 (file)
index 0000000..634bf92
--- /dev/null
+++ b/queue-4.14/eth-sun-cassini-remove-dead-code.patch
@@ -0,0 +1,47 @@
+From 32329216ca1d6ee29c41215f18b3053bb6158541 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martin=20Li=C5=A1ka?= <mliska@suse.cz>
+Date: Wed, 18 May 2022 09:18:53 +0200
+Subject: eth: sun: cassini: remove dead code
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Martin Liška <mliska@suse.cz>
+
+commit 32329216ca1d6ee29c41215f18b3053bb6158541 upstream.
+
+Fixes the following GCC warning:
+
+drivers/net/ethernet/sun/cassini.c:1316:29: error: comparison between two arrays [-Werror=array-compare]
+drivers/net/ethernet/sun/cassini.c:3783:34: error: comparison between two arrays [-Werror=array-compare]
+
+Note that 2 arrays should be compared by comparing of their addresses:
+note: use ‘&cas_prog_workaroundtab[0] == &cas_prog_null[0]’ to compare the addresses
+
+Signed-off-by: Martin Liska <mliska@suse.cz>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/net/ethernet/sun/cassini.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/net/ethernet/sun/cassini.c
++++ b/drivers/net/ethernet/sun/cassini.c
+@@ -1349,7 +1349,7 @@ static void cas_init_rx_dma(struct cas *
+       writel(val, cp->regs + REG_RX_PAGE_SIZE);
+ 
+       /* enable the header parser if desired */
+-      if (CAS_HP_FIRMWARE == cas_prog_null)
++      if (&CAS_HP_FIRMWARE[0] == &cas_prog_null[0])
+               return;
+ 
+       val = CAS_BASE(HP_CFG_NUM_CPU, CAS_NCPUS > 63 ? 0 : CAS_NCPUS);
+@@ -3819,7 +3819,7 @@ static void cas_reset(struct cas *cp, in
+ 
+       /* program header parser */
+       if ((cp->cas_flags & CAS_FLAG_TARGET_ABORT) ||
+-          (CAS_HP_ALT_FIRMWARE == cas_prog_null)) {
++          (&CAS_HP_ALT_FIRMWARE[0] == &cas_prog_null[0])) {
+               cas_load_firmware(cp, CAS_HP_FIRMWARE);
+       } else {
+               cas_load_firmware(cp, CAS_HP_ALT_FIRMWARE);

diff --git a/queue-4.14/series b/queue-4.14/series
index c73032e2cd0c1a9267f3685aa596b70413d41028..073694a9e07e9ad0fcb62a309338ed3c23774d4c 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -42,3 +42,4 @@ ata-libata-scsi-use-correct-device-no-in-ata_find_dev.patch
 x86-boot-wrap-literal-addresses-in-absolute_pointer.patch
 acpi-thermal-drop-an-always-true-check.patch
 gcc-12-disable-wdangling-pointer-warning-for-now.patch
+eth-sun-cassini-remove-dead-code.patch