6.1-stable patches

added patches:
	revert-staging-rtl8192e-replace-macro-rtl_pci_device-with-pci_device.patch

diff --git a/queue-6.1/revert-staging-rtl8192e-replace-macro-rtl_pci_device-with-pci_device.patch b/queue-6.1/revert-staging-rtl8192e-replace-macro-rtl_pci_device-with-pci_device.patch
new file mode 100644 (file)
index 0000000..7df3f19
--- /dev/null
+++ b/queue-6.1/revert-staging-rtl8192e-replace-macro-rtl_pci_device-with-pci_device.patch
@@ -0,0 +1,53 @@
+From 47de7971108b44c0c139479358e8ed92f646cbf4 Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Mon, 12 Jun 2023 12:06:32 +0200
+Subject: Revert "staging: rtl8192e: Replace macro RTL_PCI_DEVICE with PCI_DEVICE"
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+This reverts commit ec310591cf839653a5b2c1fcf6b8a110c3f2485c which is
+commit fda2093860df4812d69052a8cf4997e53853a340 upstream.
+
+Ben reports that this should not have been backported to the older
+kernels as the rest of the macro is not empty.  It was a clean-up patch
+in 6.4-rc1 only, it did not add new device ids.
+
+Reported-by: Ben Hutchings <ben@decadent.org.uk>
+Cc: Philipp Hortmann <philipp.g.hortmann@gmail.com>
+Cc: Sasha Levin <sashal@kernel.org>
+Link: https://lore.kernel.org/r/aa0d401a7f63448cd4c2fe4a2d7e8495d9aa123e.camel@decadent.org.uk
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/staging/rtl8192e/rtl8192e/rtl_core.c |    6 +++---
+ drivers/staging/rtl8192e/rtl8192e/rtl_core.h |    5 +++++
+ 2 files changed, 8 insertions(+), 3 deletions(-)
+
+--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
++++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+@@ -48,9 +48,9 @@ static const struct rtl819x_ops rtl819xp
+ };
+ 
+ static struct pci_device_id rtl8192_pci_id_tbl[] = {
+-      {PCI_DEVICE(0x10ec, 0x8192)},
+-      {PCI_DEVICE(0x07aa, 0x0044)},
+-      {PCI_DEVICE(0x07aa, 0x0047)},
++      {RTL_PCI_DEVICE(0x10ec, 0x8192, rtl819xp_ops)},
++      {RTL_PCI_DEVICE(0x07aa, 0x0044, rtl819xp_ops)},
++      {RTL_PCI_DEVICE(0x07aa, 0x0047, rtl819xp_ops)},
+       {}
+ };
+ 
+--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
++++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
+@@ -55,6 +55,11 @@
+ #define IS_HARDWARE_TYPE_8192SE(_priv)                \
+       (((struct r8192_priv *)rtllib_priv(dev))->card_8192 == NIC_8192SE)
+ 
++#define RTL_PCI_DEVICE(vend, dev, cfg) \
++      .vendor = (vend), .device = (dev), \
++      .subvendor = PCI_ANY_ID, .subdevice = PCI_ANY_ID, \
++      .driver_data = (kernel_ulong_t)&(cfg)
++
+ #define TOTAL_CAM_ENTRY               32
+ #define CAM_CONTENT_COUNT     8
+ 

diff --git a/queue-6.1/series b/queue-6.1/series
index 676f200db85b39b1f97ccced0520f9e33dfe9a2c..9e76771529f94d7a7d6f16c83cdb00c20acb13cd 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -129,3 +129,4 @@ revert-ext4-don-t-clear-sb_rdonly-when-remounting-r-w-until-quota-is-re-enabled.
 ext4-only-check-dquot_initialize_needed-when-debugging.patch
 wifi-rtw89-correct-ps-calculation-for-supports_dynamic_ps.patch
 wifi-rtw88-correct-ps-calculation-for-supports_dynamic_ps.patch
+revert-staging-rtl8192e-replace-macro-rtl_pci_device-with-pci_device.patch