This is a note to let you know that I've just added the patch titled
Revert "staging: rtl8192e: Replace macro RTL_PCI_DEVICE with PCI_DEVICE"
to the 5.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
revert-staging-rtl8192e-replace-macro-rtl_pci_device-with-pci_device.patch
and it can be found in the queue-5.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 47de7971108b44c0c139479358e8ed92f646cbf4 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
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@xxxxxxxxxxxxxxxxxxx>
This reverts commit bb1313f37e7b267fcf0fe475b974be8de5f39945 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@xxxxxxxxxxxxxxx>
Cc: Philipp Hortmann <philipp.g.hortmann@xxxxxxxxx>
Cc: Sasha Levin <sashal@xxxxxxxxxx>
Link: https://lore.kernel.org/r/aa0d401a7f63448cd4c2fe4a2d7e8495d9aa123e.camel@xxxxxxxxxxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
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
Patches currently in stable-queue which might be from gregkh@xxxxxxxxxxxxxxxxxxx are
queue-5.10/ext4-only-check-dquot_initialize_needed-when-debugging.patch
queue-5.10/bluetooth-hci_qca-fix-debugfs-registration.patch
queue-5.10/input-psmouse-fix-oob-access-in-elantech-protocol.patch
queue-5.10/remove-the-sx8-block-driver.patch
queue-5.10/xfs-verify-buffer-contents-when-we-skip-log-replay.patch
queue-5.10/tcp-fix-tcp_min_tso_segs-sysctl.patch
queue-5.10/usb-usbfs-enforce-page-requirements-for-mmap.patch
queue-5.10/staging-vc04_services-fix-gcc-13-build-warning.patch
queue-5.10/alsa-hda-realtek-add-a-quirk-for-hp-slim-desktop-s01.patch
queue-5.10/revert-ext4-don-t-clear-sb_rdonly-when-remounting-r-w-until-quota-is-re-enabled.patch
queue-5.10/bonding-gcc13-synchronize-bond_-a-t-lb_xmit-types.patch
queue-5.10/f2fs-fix-iostat-lock-protection.patch
queue-5.10/alsa-hda-realtek-add-lenovo-p3-tower-platform.patch
queue-5.10/bluetooth-fix-use-after-free-in-hci_remove_ltk-hci_remove_irk.patch
queue-5.10/btrfs-check-return-value-of-btrfs_commit_transaction-in-relocation.patch
queue-5.10/i40e-fix-build-warning-in-ice_fltr_add_mac_to_list.patch
queue-5.10/can-j1939-change-j1939_netdev_lock-type-to-mutex.patch
queue-5.10/input-xpad-delete-a-razer-deathadder-mouse-vid-pid-entry.patch
queue-5.10/drm-atomic-don-t-pollute-crtc_state-mode_blob-with-error-pointers.patch
queue-5.10/revert-staging-rtl8192e-replace-macro-rtl_pci_device-with-pci_device.patch
queue-5.10/can-j1939-j1939_sk_send_loop_abort-improved-error-queue-handling-in-j1939-socket.patch
queue-5.10/drm-amdgpu-fix-xclk-freq-on-chip_stoney.patch
queue-5.10/i40e-fix-build-warnings-in-i40e_alloc.h.patch
queue-5.10/gcc-plugins-reorganize-gimple-includes-for-gcc-13.patch
queue-5.10/sfc-gcc13-synchronize-ef100_enqueue_skb-s-return-type.patch
queue-5.10/ceph-fix-use-after-free-bug-for-inodes-when-flushing-capsnaps.patch
queue-5.10/blk-iocost-avoid-64-bit-division-in-ioc_timer_fn.patch
queue-5.10/can-j1939-avoid-possible-use-after-free-when-j1939_can_rx_register-fails.patch
queue-5.10/batman-adv-broken-sync-while-rescheduling-delayed-work.patch
queue-5.10/i40iw-fix-build-warning-in-i40iw_manage_apbvt.patch
queue-5.10/mips-locking-atomic-fix-atomic-_64-_sub_if_positive.patch
queue-5.10/s390-dasd-use-correct-lock-while-counting-channel-queue-length.patch
queue-5.10/tee-amdtee-add-return_origin-to-struct-tee_cmd_load_ta.patch
queue-5.10/btrfs-unset-reloc-control-if-transaction-commit-fails-in-prepare_to_relocate.patch
queue-5.10/usb-usbfs-use-consistent-mmap-functions.patch
queue-5.10/rbd-get-snapshot-context-after-exclusive-lock-is-ensured-to-be-held.patch
queue-5.10/block-blk-iocost-gcc13-keep-large-values-in-a-new-enum.patch
queue-5.10/staging-vchiq_core-drop-vchiq_status-from-vchiq_initialise.patch
queue-5.10/pinctrl-meson-axg-add-missing-gpioa_18-gpio-group.patch
queue-5.10/rbd-move-rbd_obj_flag_copyup_enabled-flag-setting.patch
queue-5.10/ata-ahci-fix-enum-constants-for-gcc-13.patch
