From: Greg Kroah-Hartman Date: Mon, 12 Jun 2023 10:13:07 +0000 (+0200) Subject: 5.15-stable patches X-Git-Tag: v4.14.318~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=63a9b3d82a8e5ed40cff665d4cf23a8b67c834e7;p=thirdparty%2Fkernel%2Fstable-queue.git 5.15-stable patches added patches: revert-staging-rtl8192e-replace-macro-rtl_pci_device-with-pci_device.patch --- diff --git a/queue-5.15/revert-staging-rtl8192e-replace-macro-rtl_pci_device-with-pci_device.patch b/queue-5.15/revert-staging-rtl8192e-replace-macro-rtl_pci_device-with-pci_device.patch new file mode 100644 index 00000000000..21cee097be9 --- /dev/null +++ b/queue-5.15/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 +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 + +This reverts commit a97e60bd28965014ae4195de1e1573a1fc7bcb02 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 +Cc: Philipp Hortmann +Cc: Sasha Levin +Link: https://lore.kernel.org/r/aa0d401a7f63448cd4c2fe4a2d7e8495d9aa123e.camel@decadent.org.uk +Signed-off-by: Greg Kroah-Hartman +--- + 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 +@@ -49,9 +49,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-5.15/series b/queue-5.15/series index 18d8712ae2e..450d3df06ad 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -88,3 +88,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 revert-debugobject-ensure-pool-refill-again.patch xfs-verify-buffer-contents-when-we-skip-log-replay.patch +revert-staging-rtl8192e-replace-macro-rtl_pci_device-with-pci_device.patch