From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 25 Aug 2022 10:37:48 +0000 (+0200)
Subject: 5.15-stable patches
X-Git-Tag: v5.10.140~57
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a7dd789cb97f70cd39ff8a90b206bbe78b5d58c4;p=thirdparty%2Fkernel%2Fstable-queue.git

5.15-stable patches

added patches:
	eth-sun-cassini-remove-dead-code.patch
	wifi-rtlwifi-remove-always-true-condition-pointed-out-by-gcc-12.patch
---

diff --git a/queue-5.15/eth-sun-cassini-remove-dead-code.patch b/queue-5.15/eth-sun-cassini-remove-dead-code.patch
new file mode 100644
index 00000000000..cb842cc5acb
--- /dev/null
+++ b/queue-5.15/eth-sun-cassini-remove-dead-code.patch
@@ -0,0 +1,48 @@
+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>
+Cc: "Sudip Mukherjee (Codethink)" <sudipm.mukherjee@gmail.com>
+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
+@@ -1325,7 +1325,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);
+@@ -3794,7 +3794,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-5.15/series b/queue-5.15/series
new file mode 100644
index 00000000000..306e0015c80
--- /dev/null
+++ b/queue-5.15/series
@@ -0,0 +1,2 @@
+wifi-rtlwifi-remove-always-true-condition-pointed-out-by-gcc-12.patch
+eth-sun-cassini-remove-dead-code.patch
diff --git a/queue-5.15/wifi-rtlwifi-remove-always-true-condition-pointed-out-by-gcc-12.patch b/queue-5.15/wifi-rtlwifi-remove-always-true-condition-pointed-out-by-gcc-12.patch
new file mode 100644
index 00000000000..309ac9a3eb4
--- /dev/null
+++ b/queue-5.15/wifi-rtlwifi-remove-always-true-condition-pointed-out-by-gcc-12.patch
@@ -0,0 +1,38 @@
+From ee3db469dd317e82f57b13aa3bc61be5cb60c2b4 Mon Sep 17 00:00:00 2001
+From: Jakub Kicinski <kuba@kernel.org>
+Date: Fri, 20 May 2022 12:43:15 -0700
+Subject: wifi: rtlwifi: remove always-true condition pointed out by GCC 12
+
+From: Jakub Kicinski <kuba@kernel.org>
+
+commit ee3db469dd317e82f57b13aa3bc61be5cb60c2b4 upstream.
+
+The .value is a two-dim array, not a pointer.
+
+struct iqk_matrix_regs {
+	bool iqk_done;
+        long value[1][IQK_MATRIX_REG_NUM];
+};
+
+Acked-by: Kalle Valo <kvalo@kernel.org>
+Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+Cc: "Sudip Mukherjee (Codethink)" <sudipm.mukherjee@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c |    5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c
++++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c
+@@ -2386,10 +2386,7 @@ void rtl92d_phy_reload_iqk_setting(struc
+ 			rtl_dbg(rtlpriv, COMP_SCAN, DBG_LOUD,
+ 				"Just Read IQK Matrix reg for channel:%d....\n",
+ 				channel);
+-			if ((rtlphy->iqk_matrix[indexforchannel].
+-			     value[0] != NULL)
+-				/*&&(regea4 != 0) */)
+-				_rtl92d_phy_patha_fill_iqk_matrix(hw, true,
++			_rtl92d_phy_patha_fill_iqk_matrix(hw, true,
+ 					rtlphy->iqk_matrix[
+ 					indexforchannel].value,	0,
+ 					(rtlphy->iqk_matrix[