mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-29 18:19:02 +00:00
28f534d953
Update patch set for new release and add required kernel option CONFIG_ZRAM_TRACK_ENTRY_ACTIME to generic config Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.66 Manually rebased: bcm27xx/patches-6.6/950-0092-MMC-added-alternative-MMC-driver.patch bcm53xx/patches-6.6/180-usb-xhci-add-support-for-performing-fake-doorbell.patch starfive/patches-6.6/1000-serial-8250_dw-Add-starfive-jh7100-hsuart-compatible.patch Removed upstreamed: bcm27xx/patches-6.6/950-0029-vc4_hdmi-Avoid-log-spam-for-audio-start-failure.patch[1] All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.66&id=e0388a95736abd1f5f5a94221dd1ac24eacbd4d7 Build system: x86/64 Build-tested: bcm27xx/bcm2712, flogic/glinet_gl-mt6000, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3, x86/64 Run-tested: bcm27xx/bcm2712, flogic/glinet_gl-mt6000, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3, x86/64 Signed-off-by: John Audia <therealgraysky@proton.me> Link: https://github.com/openwrt/openwrt/pull/17271 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
32 lines
1.2 KiB
Diff
32 lines
1.2 KiB
Diff
From 97e176fcbbf3c0f2bd410c9b241177c051f57176 Mon Sep 17 00:00:00 2001
|
|
From: Heiner Kallweit <hkallweit1@gmail.com>
|
|
Date: Wed, 10 Apr 2024 15:11:28 +0200
|
|
Subject: [PATCH] r8169: add missing conditional compiling for call to
|
|
r8169_remove_leds
|
|
|
|
Add missing dependency on CONFIG_R8169_LEDS. As-is a link error occurs
|
|
if config option CONFIG_R8169_LEDS isn't enabled.
|
|
|
|
Fixes: 19fa4f2a85d7 ("r8169: fix LED-related deadlock on module removal")
|
|
Reported-by: Venkat Rao Bagalkote <venkat88@linux.vnet.ibm.com>
|
|
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
|
|
Tested-By: Venkat Rao Bagalkote <venkat88@linux.vnet.ibm.com>
|
|
Link: https://lore.kernel.org/r/d080038c-eb6b-45ac-9237-b8c1cdd7870f@gmail.com
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
drivers/net/ethernet/realtek/r8169_main.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/net/ethernet/realtek/r8169_main.c
|
|
+++ b/drivers/net/ethernet/realtek/r8169_main.c
|
|
@@ -5077,7 +5077,8 @@ static void rtl_remove_one(struct pci_de
|
|
|
|
cancel_work_sync(&tp->wk.work);
|
|
|
|
- r8169_remove_leds(tp->leds);
|
|
+ if (IS_ENABLED(CONFIG_R8169_LEDS))
|
|
+ r8169_remove_leds(tp->leds);
|
|
|
|
unregister_netdev(tp->dev);
|
|
|