From 1a46b9c768ad95af872b808bb1a94d6e07718ac0 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 12 Jun 2023 12:12:29 +0200 Subject: [PATCH] 4.14-stable patches added patches: revert-staging-rtl8192e-replace-macro-rtl_pci_device-with-pci_device.patch --- ...macro-rtl_pci_device-with-pci_device.patch | 53 +++++++++++++++++++ queue-4.14/series | 1 + 2 files changed, 54 insertions(+) create mode 100644 queue-4.14/revert-staging-rtl8192e-replace-macro-rtl_pci_device-with-pci_device.patch diff --git a/queue-4.14/revert-staging-rtl8192e-replace-macro-rtl_pci_device-with-pci_device.patch b/queue-4.14/revert-staging-rtl8192e-replace-macro-rtl_pci_device-with-pci_device.patch new file mode 100644 index 00000000000..20e04b57714 --- /dev/null +++ b/queue-4.14/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 8809b5e3bca90170deb466d7f4447dc91c8569da 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 +@@ -61,9 +61,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 +@@ -67,6 +67,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-4.14/series b/queue-4.14/series index 55554d39137..12c3c1b8769 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -18,3 +18,4 @@ i2c-sprd-delete-i2c-adapter-in-.remove-s-error-path.patch ext4-only-check-dquot_initialize_needed-when-debugging.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 +revert-staging-rtl8192e-replace-macro-rtl_pci_device-with-pci_device.patch -- 2.47.2