From: Greg Kroah-Hartman Date: Mon, 12 Jun 2023 10:12:48 +0000 (+0200) Subject: 5.4-stable patches X-Git-Tag: v4.14.318~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e87c3a77d0b1da4f52fce692ca001edea8a13059;p=thirdparty%2Fkernel%2Fstable-queue.git 5.4-stable patches added patches: revert-staging-rtl8192e-replace-macro-rtl_pci_device-with-pci_device.patch --- diff --git a/queue-5.4/revert-staging-rtl8192e-replace-macro-rtl_pci_device-with-pci_device.patch b/queue-5.4/revert-staging-rtl8192e-replace-macro-rtl_pci_device-with-pci_device.patch new file mode 100644 index 00000000000..b9b62520949 --- /dev/null +++ b/queue-5.4/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 8a65476dd1cad790ca67ea639be98c14fcd86288 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 +@@ -50,9 +50,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.4/series b/queue-5.4/series index 15aa6be3042..edf2a785dd8 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -42,3 +42,4 @@ rbd-get-snapshot-context-after-exclusive-lock-is-ensured-to-be-held.patch btrfs-check-return-value-of-btrfs_commit_transaction-in-relocation.patch btrfs-unset-reloc-control-if-transaction-commit-fails-in-prepare_to_relocate.patch mtd-spinand-macronix-add-support-for-mx35lfxge4ad.patch +revert-staging-rtl8192e-replace-macro-rtl_pci_device-with-pci_device.patch