From f17a46754841f79ce4ecd802d5909352ef950e51 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Wed, 10 Nov 2021 14:53:13 +0100 Subject: [PATCH] Update OpenWrt --- build.sh | 6 +- ...-tt-Replace-thermal_notify_framework.patch | 15 - .../900-remove_module_supported_device.patch | 263 ------------------ ...LUG-with-UEVENT-in-FW_ACTION-defines.patch | 13 - 4 files changed, 3 insertions(+), 294 deletions(-) delete mode 100644 root/package/kernel/mac80211/patches/build/1-2-net-wireless-intel-iwlwifi-mvm-tt-Replace-thermal_notify_framework.patch delete mode 100644 root/package/kernel/mac80211/patches/build/900-remove_module_supported_device.patch delete mode 100644 root/package/kernel/mac80211/patches/build/firmware-replace-HOTPLUG-with-UEVENT-in-FW_ACTION-defines.patch diff --git a/build.sh b/build.sh index 50834967..aeee7466 100755 --- a/build.sh +++ b/build.sh @@ -96,9 +96,9 @@ if [ "$OMR_OPENWRT" = "default" ]; then _get_repo feeds/packages https://github.com/openwrt/packages "3aa30ceee4fcf7b131bdc0f98658391069573e12" _get_repo feeds/luci https://github.com/openwrt/luci "f28aaa35cd5c0cbbe59d8cc6a67de88ceeac382e" else - _get_repo "$OMR_TARGET/source" https://github.com/openwrt/openwrt "585cef5f1a9c1c3aecd7d231364618e96d03ab65" - _get_repo feeds/packages https://github.com/openwrt/packages "e2055b5433da245e6ff8fb060d018d036499cf38" - _get_repo feeds/luci https://github.com/openwrt/luci "7c943a1d6bcf449019ca8a43e800e51f269bb8f6" + _get_repo "$OMR_TARGET/source" https://github.com/openwrt/openwrt "8a6b1a8d29cbd62f005ba20998ca9c8048ff49fc" + _get_repo feeds/packages https://github.com/openwrt/packages "b5132de5cf4f7d0562445cf3c65f9f1a4bcb1bbf" + _get_repo feeds/luci https://github.com/openwrt/luci "02398a33837d1fe8fd23d933ad7ac32025144805" fi elif [ "$OMR_OPENWRT" = "master" ]; then _get_repo "$OMR_TARGET/source" https://github.com/openwrt/openwrt "master" diff --git a/root/package/kernel/mac80211/patches/build/1-2-net-wireless-intel-iwlwifi-mvm-tt-Replace-thermal_notify_framework.patch b/root/package/kernel/mac80211/patches/build/1-2-net-wireless-intel-iwlwifi-mvm-tt-Replace-thermal_notify_framework.patch deleted file mode 100644 index 78d66377..00000000 --- a/root/package/kernel/mac80211/patches/build/1-2-net-wireless-intel-iwlwifi-mvm-tt-Replace-thermal_notify_framework.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/tt.c b/drivers/net/wireless/intel/iwlwifi/mvm/tt.c -index 507625f96dd7..a0c6be03903a 100644 ---- a/drivers/net/wireless/intel/iwlwifi/mvm/tt.c -+++ b/drivers/net/wireless/intel/iwlwifi/mvm/tt.c -@@ -146,8 +146,8 @@ void iwl_mvm_temp_notif(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb) - if (mvm->tz_device.tzone) { - struct iwl_mvm_thermal_device *tz_dev = &mvm->tz_device; - -- thermal_notify_framework(tz_dev->tzone, -- tz_dev->fw_trips_index[ths_crossed]); -+ thermal_zone_device_update(tz_dev->tzone, -+ THERMAL_TRIP_VIOLATED); - } - #endif /* CONFIG_THERMAL */ - } diff --git a/root/package/kernel/mac80211/patches/build/900-remove_module_supported_device.patch b/root/package/kernel/mac80211/patches/build/900-remove_module_supported_device.patch deleted file mode 100644 index a9ca382e..00000000 --- a/root/package/kernel/mac80211/patches/build/900-remove_module_supported_device.patch +++ /dev/null @@ -1,263 +0,0 @@ -diff -aurN backports-5.10.42-1.anc/drivers/net/wireless/admtek/adm8211.c backports-5.10.42-1/drivers/net/wireless/admtek/adm8211.c ---- backports-5.10.42-1.anc/drivers/net/wireless/admtek/adm8211.c 2021-09-23 22:26:42.899395773 +0200 -+++ backports-5.10.42-1/drivers/net/wireless/admtek/adm8211.c 2021-09-23 22:30:53.147231692 +0200 -@@ -28,7 +28,6 @@ - MODULE_AUTHOR("Michael Wu "); - MODULE_AUTHOR("Jouni Malinen "); - MODULE_DESCRIPTION("Driver for IEEE 802.11b wireless cards based on ADMtek ADM8211"); --MODULE_SUPPORTED_DEVICE("ADM8211"); - MODULE_LICENSE("GPL"); - - static unsigned int tx_ring_size __read_mostly = 16; -diff -aurN backports-5.10.42-1.anc/drivers/net/wireless/ath/ath5k/base.c backports-5.10.42-1/drivers/net/wireless/ath/ath5k/base.c ---- backports-5.10.42-1.anc/drivers/net/wireless/ath/ath5k/base.c 2021-09-23 22:26:42.903395707 +0200 -+++ backports-5.10.42-1/drivers/net/wireless/ath/ath5k/base.c 2021-09-23 22:30:46.011350432 +0200 -@@ -90,7 +90,6 @@ - MODULE_AUTHOR("Jiri Slaby"); - MODULE_AUTHOR("Nick Kossifidis"); - MODULE_DESCRIPTION("Support for 5xxx series of Atheros 802.11 wireless LAN cards."); --MODULE_SUPPORTED_DEVICE("Atheros 5xxx WLAN cards"); - MODULE_LICENSE("Dual BSD/GPL"); - - static int ath5k_init(struct ieee80211_hw *hw); -diff -aurN backports-5.10.42-1.anc/drivers/net/wireless/ath/ath9k/hw.c backports-5.10.42-1/drivers/net/wireless/ath/ath9k/hw.c ---- backports-5.10.42-1.anc/drivers/net/wireless/ath/ath9k/hw.c 2021-09-23 22:26:42.907395640 +0200 -+++ backports-5.10.42-1/drivers/net/wireless/ath/ath9k/hw.c 2021-09-23 22:30:44.355377987 +0200 -@@ -34,7 +34,6 @@ - - MODULE_AUTHOR("Atheros Communications"); - MODULE_DESCRIPTION("Support for Atheros 802.11n wireless LAN cards."); --MODULE_SUPPORTED_DEVICE("Atheros 802.11n WLAN cards"); - MODULE_LICENSE("Dual BSD/GPL"); - - static void ath9k_hw_set_clockrate(struct ath_hw *ah) -diff -aurN backports-5.10.42-1.anc/drivers/net/wireless/ath/ath9k/init.c backports-5.10.42-1/drivers/net/wireless/ath/ath9k/init.c ---- backports-5.10.42-1.anc/drivers/net/wireless/ath/ath9k/init.c 2021-09-23 22:26:42.907395640 +0200 -+++ backports-5.10.42-1/drivers/net/wireless/ath/ath9k/init.c 2021-09-23 22:30:44.355377987 +0200 -@@ -37,7 +37,6 @@ - - MODULE_AUTHOR("Atheros Communications"); - MODULE_DESCRIPTION("Support for Atheros 802.11n wireless LAN cards."); --MODULE_SUPPORTED_DEVICE("Atheros 802.11n WLAN cards"); - MODULE_LICENSE("Dual BSD/GPL"); - - static unsigned int ath9k_debug = ATH_DBG_DEFAULT; -diff -aurN backports-5.10.42-1.anc/drivers/net/wireless/atmel/atmel.c backports-5.10.42-1/drivers/net/wireless/atmel/atmel.c ---- backports-5.10.42-1.anc/drivers/net/wireless/atmel/atmel.c 2021-09-23 22:26:42.911395574 +0200 -+++ backports-5.10.42-1/drivers/net/wireless/atmel/atmel.c 2021-09-23 22:30:46.023350232 +0200 -@@ -75,7 +75,6 @@ - MODULE_AUTHOR("Simon Kelley"); - MODULE_DESCRIPTION("Support for Atmel at76c50x 802.11 wireless ethernet cards."); - MODULE_LICENSE("GPL"); --MODULE_SUPPORTED_DEVICE("Atmel at76c50x wireless cards"); - - /* The name of the firmware file to be loaded - over-rides any automatic selection */ -diff -aurN backports-5.10.42-1.anc/drivers/net/wireless/atmel/atmel_cs.c backports-5.10.42-1/drivers/net/wireless/atmel/atmel_cs.c ---- backports-5.10.42-1.anc/drivers/net/wireless/atmel/atmel_cs.c 2021-09-23 22:26:42.911395574 +0200 -+++ backports-5.10.42-1/drivers/net/wireless/atmel/atmel_cs.c 2021-09-23 22:30:46.023350232 +0200 -@@ -57,7 +57,6 @@ - MODULE_AUTHOR("Simon Kelley"); - MODULE_DESCRIPTION("Support for Atmel at76c50x 802.11 wireless ethernet cards."); - MODULE_LICENSE("GPL"); --MODULE_SUPPORTED_DEVICE("Atmel at76c50x PCMCIA cards"); - - /*====================================================================*/ - -diff -aurN backports-5.10.42-1.anc/drivers/net/wireless/atmel/atmel_pci.c backports-5.10.42-1/drivers/net/wireless/atmel/atmel_pci.c ---- backports-5.10.42-1.anc/drivers/net/wireless/atmel/atmel_pci.c 2021-09-23 22:26:42.911395574 +0200 -+++ backports-5.10.42-1/drivers/net/wireless/atmel/atmel_pci.c 2021-09-23 22:30:46.023350232 +0200 -@@ -16,7 +16,6 @@ - MODULE_AUTHOR("Simon Kelley"); - MODULE_DESCRIPTION("Support for Atmel at76c50x 802.11 wireless ethernet cards."); - MODULE_LICENSE("GPL"); --MODULE_SUPPORTED_DEVICE("Atmel at76c506 PCI wireless cards"); - - static const struct pci_device_id card_ids[] = { - { 0x1114, 0x0506, PCI_ANY_ID, PCI_ANY_ID }, -diff -aurN backports-5.10.42-1.anc/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c backports-5.10.42-1/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c ---- backports-5.10.42-1.anc/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c 2021-09-23 22:26:42.915395506 +0200 -+++ backports-5.10.42-1/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c 2021-09-23 22:30:48.843303308 +0200 -@@ -87,7 +87,6 @@ - - MODULE_AUTHOR("Broadcom Corporation"); - MODULE_DESCRIPTION("Broadcom 802.11n wireless LAN driver."); --MODULE_SUPPORTED_DEVICE("Broadcom 802.11n WLAN cards"); - MODULE_LICENSE("Dual BSD/GPL"); - /* This needs to be adjusted when brcms_firmwares changes */ - MODULE_FIRMWARE("brcm/bcm43xx-0.fw"); -diff -aurN backports-5.10.42-1.anc/drivers/net/wireless/broadcom/brcm80211/brcmutil/utils.c backports-5.10.42-1/drivers/net/wireless/broadcom/brcm80211/brcmutil/utils.c ---- backports-5.10.42-1.anc/drivers/net/wireless/broadcom/brcm80211/brcmutil/utils.c 2021-09-23 22:26:42.915395506 +0200 -+++ backports-5.10.42-1/drivers/net/wireless/broadcom/brcm80211/brcmutil/utils.c 2021-09-23 22:30:51.611257250 +0200 -@@ -12,7 +12,6 @@ - - MODULE_AUTHOR("Broadcom Corporation"); - MODULE_DESCRIPTION("Broadcom 802.11n wireless LAN driver utilities."); --MODULE_SUPPORTED_DEVICE("Broadcom 802.11n WLAN cards"); - MODULE_LICENSE("Dual BSD/GPL"); - - struct sk_buff *brcmu_pkt_buf_get_skb(uint len) -diff -aurN backports-5.10.42-1.anc/drivers/net/wireless/cisco/airo.c backports-5.10.42-1/drivers/net/wireless/cisco/airo.c ---- backports-5.10.42-1.anc/drivers/net/wireless/cisco/airo.c 2021-09-23 22:26:42.915395506 +0200 -+++ backports-5.10.42-1/drivers/net/wireless/cisco/airo.c 2021-09-23 22:30:53.147231692 +0200 -@@ -251,7 +251,6 @@ - MODULE_DESCRIPTION("Support for Cisco/Aironet 802.11 wireless ethernet cards. " - "Direct support for ISA/PCI/MPI cards and support for PCMCIA when used with airo_cs."); - MODULE_LICENSE("Dual BSD/GPL"); --MODULE_SUPPORTED_DEVICE("Aironet 4500, 4800 and Cisco 340/350"); - module_param_hw_array(io, int, ioport, NULL, 0); - module_param_hw_array(irq, int, irq, NULL, 0); - module_param_array(rates, int, NULL, 0); -diff -aurN backports-5.10.42-1.anc/drivers/net/wireless/cisco/airo_cs.c backports-5.10.42-1/drivers/net/wireless/cisco/airo_cs.c ---- backports-5.10.42-1.anc/drivers/net/wireless/cisco/airo_cs.c 2021-09-23 22:26:42.915395506 +0200 -+++ backports-5.10.42-1/drivers/net/wireless/cisco/airo_cs.c 2021-09-23 22:30:53.159231492 +0200 -@@ -47,7 +47,6 @@ - "cards. This is the module that links the PCMCIA card " - "with the airo module."); - MODULE_LICENSE("Dual BSD/GPL"); --MODULE_SUPPORTED_DEVICE("Aironet 4500, 4800 and Cisco 340 PCMCIA cards"); - - /*====================================================================*/ - -diff -aurN backports-5.10.42-1.anc/drivers/net/wireless/intersil/hostap/hostap_cs.c backports-5.10.42-1/drivers/net/wireless/intersil/hostap/hostap_cs.c ---- backports-5.10.42-1.anc/drivers/net/wireless/intersil/hostap/hostap_cs.c 2021-09-23 22:26:42.919395441 +0200 -+++ backports-5.10.42-1/drivers/net/wireless/intersil/hostap/hostap_cs.c 2021-09-23 22:30:53.027233689 +0200 -@@ -26,7 +26,6 @@ - MODULE_AUTHOR("Jouni Malinen"); - MODULE_DESCRIPTION("Support for Intersil Prism2-based 802.11 wireless LAN " - "cards (PC Card)."); --MODULE_SUPPORTED_DEVICE("Intersil Prism2-based WLAN cards (PC Card)"); - MODULE_LICENSE("GPL"); - - -diff -aurN backports-5.10.42-1.anc/drivers/net/wireless/intersil/hostap/hostap_pci.c backports-5.10.42-1/drivers/net/wireless/intersil/hostap/hostap_pci.c ---- backports-5.10.42-1.anc/drivers/net/wireless/intersil/hostap/hostap_pci.c 2021-09-23 22:26:42.919395441 +0200 -+++ backports-5.10.42-1/drivers/net/wireless/intersil/hostap/hostap_pci.c 2021-09-23 22:30:53.027233689 +0200 -@@ -27,7 +27,6 @@ - MODULE_AUTHOR("Jouni Malinen"); - MODULE_DESCRIPTION("Support for Intersil Prism2.5-based 802.11 wireless LAN " - "PCI cards."); --MODULE_SUPPORTED_DEVICE("Intersil Prism2.5-based WLAN PCI cards"); - MODULE_LICENSE("GPL"); - - -diff -aurN backports-5.10.42-1.anc/drivers/net/wireless/intersil/hostap/hostap_plx.c backports-5.10.42-1/drivers/net/wireless/intersil/hostap/hostap_plx.c ---- backports-5.10.42-1.anc/drivers/net/wireless/intersil/hostap/hostap_plx.c 2021-09-23 22:26:42.919395441 +0200 -+++ backports-5.10.42-1/drivers/net/wireless/intersil/hostap/hostap_plx.c 2021-09-23 22:30:53.031233622 +0200 -@@ -30,7 +30,6 @@ - MODULE_AUTHOR("Jouni Malinen"); - MODULE_DESCRIPTION("Support for Intersil Prism2-based 802.11 wireless LAN " - "cards (PLX)."); --MODULE_SUPPORTED_DEVICE("Intersil Prism2-based WLAN cards (PLX)"); - MODULE_LICENSE("GPL"); - - -diff -aurN backports-5.10.42-1.anc/drivers/net/wireless/ralink/rt2x00/rt2400pci.c backports-5.10.42-1/drivers/net/wireless/ralink/rt2x00/rt2400pci.c ---- backports-5.10.42-1.anc/drivers/net/wireless/ralink/rt2x00/rt2400pci.c 2021-09-23 22:26:42.927395307 +0200 -+++ backports-5.10.42-1/drivers/net/wireless/ralink/rt2x00/rt2400pci.c 2021-09-23 22:30:53.039233489 +0200 -@@ -1821,7 +1821,6 @@ - MODULE_AUTHOR(DRV_PROJECT); - MODULE_VERSION(DRV_VERSION); - MODULE_DESCRIPTION("Ralink RT2400 PCI & PCMCIA Wireless LAN driver."); --MODULE_SUPPORTED_DEVICE("Ralink RT2460 PCI & PCMCIA chipset based cards"); - MODULE_DEVICE_TABLE(pci, rt2400pci_device_table); - MODULE_LICENSE("GPL"); - -diff -aurN backports-5.10.42-1.anc/drivers/net/wireless/ralink/rt2x00/rt2500pci.c backports-5.10.42-1/drivers/net/wireless/ralink/rt2x00/rt2500pci.c ---- backports-5.10.42-1.anc/drivers/net/wireless/ralink/rt2x00/rt2500pci.c 2021-09-23 22:26:42.927395307 +0200 -+++ backports-5.10.42-1/drivers/net/wireless/ralink/rt2x00/rt2500pci.c 2021-09-23 22:30:53.039233489 +0200 -@@ -2119,7 +2119,6 @@ - MODULE_AUTHOR(DRV_PROJECT); - MODULE_VERSION(DRV_VERSION); - MODULE_DESCRIPTION("Ralink RT2500 PCI & PCMCIA Wireless LAN driver."); --MODULE_SUPPORTED_DEVICE("Ralink RT2560 PCI & PCMCIA chipset based cards"); - MODULE_DEVICE_TABLE(pci, rt2500pci_device_table); - MODULE_LICENSE("GPL"); - -diff -aurN backports-5.10.42-1.anc/drivers/net/wireless/ralink/rt2x00/rt2500usb.c backports-5.10.42-1/drivers/net/wireless/ralink/rt2x00/rt2500usb.c ---- backports-5.10.42-1.anc/drivers/net/wireless/ralink/rt2x00/rt2500usb.c 2021-09-23 22:26:42.927395307 +0200 -+++ backports-5.10.42-1/drivers/net/wireless/ralink/rt2x00/rt2500usb.c 2021-09-23 22:30:53.039233489 +0200 -@@ -1956,7 +1956,6 @@ - MODULE_AUTHOR(DRV_PROJECT); - MODULE_VERSION(DRV_VERSION); - MODULE_DESCRIPTION("Ralink RT2500 USB Wireless LAN driver."); --MODULE_SUPPORTED_DEVICE("Ralink RT2570 USB chipset based cards"); - MODULE_DEVICE_TABLE(usb, rt2500usb_device_table); - MODULE_LICENSE("GPL"); - -diff -aurN backports-5.10.42-1.anc/drivers/net/wireless/ralink/rt2x00/rt2800pci.c backports-5.10.42-1/drivers/net/wireless/ralink/rt2x00/rt2800pci.c ---- backports-5.10.42-1.anc/drivers/net/wireless/ralink/rt2x00/rt2800pci.c 2021-09-23 22:26:42.927395307 +0200 -+++ backports-5.10.42-1/drivers/net/wireless/ralink/rt2x00/rt2800pci.c 2021-09-23 22:30:53.039233489 +0200 -@@ -447,7 +447,6 @@ - MODULE_AUTHOR(DRV_PROJECT); - MODULE_VERSION(DRV_VERSION); - MODULE_DESCRIPTION("Ralink RT2800 PCI & PCMCIA Wireless LAN driver."); --MODULE_SUPPORTED_DEVICE("Ralink RT2860 PCI & PCMCIA chipset based cards"); - MODULE_FIRMWARE(FIRMWARE_RT2860); - MODULE_DEVICE_TABLE(pci, rt2800pci_device_table); - MODULE_LICENSE("GPL"); -diff -aurN backports-5.10.42-1.anc/drivers/net/wireless/ralink/rt2x00/rt2800usb.c backports-5.10.42-1/drivers/net/wireless/ralink/rt2x00/rt2800usb.c ---- backports-5.10.42-1.anc/drivers/net/wireless/ralink/rt2x00/rt2800usb.c 2021-09-23 22:26:42.927395307 +0200 -+++ backports-5.10.42-1/drivers/net/wireless/ralink/rt2x00/rt2800usb.c 2021-09-23 22:30:53.039233489 +0200 -@@ -1254,7 +1254,6 @@ - MODULE_AUTHOR(DRV_PROJECT); - MODULE_VERSION(DRV_VERSION); - MODULE_DESCRIPTION("Ralink RT2800 USB Wireless LAN driver."); --MODULE_SUPPORTED_DEVICE("Ralink RT2870 USB chipset based cards"); - MODULE_DEVICE_TABLE(usb, rt2800usb_device_table); - MODULE_FIRMWARE(FIRMWARE_RT2870); - MODULE_LICENSE("GPL"); -diff -aurN backports-5.10.42-1.anc/drivers/net/wireless/ralink/rt2x00/rt61pci.c backports-5.10.42-1/drivers/net/wireless/ralink/rt2x00/rt61pci.c ---- backports-5.10.42-1.anc/drivers/net/wireless/ralink/rt2x00/rt61pci.c 2021-09-23 22:26:42.927395307 +0200 -+++ backports-5.10.42-1/drivers/net/wireless/ralink/rt2x00/rt61pci.c 2021-09-23 22:30:53.047233356 +0200 -@@ -2993,7 +2993,5 @@ - MODULE_AUTHOR(DRV_PROJECT); - MODULE_VERSION(DRV_VERSION); - MODULE_DESCRIPTION("Ralink RT61 PCI & PCMCIA Wireless LAN driver."); --MODULE_SUPPORTED_DEVICE("Ralink RT2561, RT2561s & RT2661 " -- "PCI & PCMCIA chipset based cards"); - MODULE_DEVICE_TABLE(pci, rt61pci_device_table); - MODULE_FIRMWARE(FIRMWARE_RT2561); -diff -aurN backports-5.10.42-1.anc/drivers/net/wireless/ralink/rt2x00/rt73usb.c backports-5.10.42-1/drivers/net/wireless/ralink/rt2x00/rt73usb.c ---- backports-5.10.42-1.anc/drivers/net/wireless/ralink/rt2x00/rt73usb.c 2021-09-23 22:26:42.927395307 +0200 -+++ backports-5.10.42-1/drivers/net/wireless/ralink/rt2x00/rt73usb.c 2021-09-23 22:30:53.043233423 +0200 -@@ -2513,7 +2513,6 @@ - MODULE_AUTHOR(DRV_PROJECT); - MODULE_VERSION(DRV_VERSION); - MODULE_DESCRIPTION("Ralink RT73 USB Wireless LAN driver."); --MODULE_SUPPORTED_DEVICE("Ralink RT2571W & RT2671 USB chipset based cards"); - MODULE_DEVICE_TABLE(usb, rt73usb_device_table); - MODULE_FIRMWARE(FIRMWARE_RT2571); - MODULE_LICENSE("GPL"); -diff -aurN backports-5.10.42-1.anc/drivers/net/wireless/rsi/rsi_91x_main.c backports-5.10.42-1/drivers/net/wireless/rsi/rsi_91x_main.c ---- backports-5.10.42-1.anc/drivers/net/wireless/rsi/rsi_91x_main.c 2021-09-23 22:26:42.935395174 +0200 -+++ backports-5.10.42-1/drivers/net/wireless/rsi/rsi_91x_main.c 2021-09-23 22:30:53.059233156 +0200 -@@ -441,6 +441,5 @@ - module_exit(rsi_91x_hal_module_exit); - MODULE_AUTHOR("Redpine Signals Inc"); - MODULE_DESCRIPTION("Station driver for RSI 91x devices"); --MODULE_SUPPORTED_DEVICE("RSI-91x"); - MODULE_VERSION("0.1"); - MODULE_LICENSE("Dual BSD/GPL"); -diff -aurN backports-5.10.42-1.anc/drivers/net/wireless/rsi/rsi_91x_sdio.c backports-5.10.42-1/drivers/net/wireless/rsi/rsi_91x_sdio.c ---- backports-5.10.42-1.anc/drivers/net/wireless/rsi/rsi_91x_sdio.c 2021-09-23 22:26:42.935395174 +0200 -+++ backports-5.10.42-1/drivers/net/wireless/rsi/rsi_91x_sdio.c 2021-09-23 22:30:53.063233090 +0200 -@@ -1571,7 +1571,6 @@ - - MODULE_AUTHOR("Redpine Signals Inc"); - MODULE_DESCRIPTION("Common SDIO layer for RSI drivers"); --MODULE_SUPPORTED_DEVICE("RSI-91x"); - MODULE_DEVICE_TABLE(sdio, rsi_dev_table); - MODULE_FIRMWARE(FIRMWARE_RSI9113); - MODULE_VERSION("0.1"); -diff -aurN backports-5.10.42-1.anc/drivers/net/wireless/rsi/rsi_91x_usb.c backports-5.10.42-1/drivers/net/wireless/rsi/rsi_91x_usb.c ---- backports-5.10.42-1.anc/drivers/net/wireless/rsi/rsi_91x_usb.c 2021-09-23 22:26:42.935395174 +0200 -+++ backports-5.10.42-1/drivers/net/wireless/rsi/rsi_91x_usb.c 2021-09-23 22:30:53.063233090 +0200 -@@ -926,7 +926,6 @@ - - MODULE_AUTHOR("Redpine Signals Inc"); - MODULE_DESCRIPTION("Common USB layer for RSI drivers"); --MODULE_SUPPORTED_DEVICE("RSI-91x"); - MODULE_DEVICE_TABLE(usb, rsi_dev_table); - MODULE_FIRMWARE(FIRMWARE_RSI9113); - MODULE_VERSION("0.1"); diff --git a/root/package/kernel/mac80211/patches/build/firmware-replace-HOTPLUG-with-UEVENT-in-FW_ACTION-defines.patch b/root/package/kernel/mac80211/patches/build/firmware-replace-HOTPLUG-with-UEVENT-in-FW_ACTION-defines.patch deleted file mode 100644 index f04b5a0f..00000000 --- a/root/package/kernel/mac80211/patches/build/firmware-replace-HOTPLUG-with-UEVENT-in-FW_ACTION-defines.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c -index 8509b989940c..5bf15355c2b3 100644 ---- a/drivers/net/wireless/ti/wlcore/main.c -+++ b/drivers/net/wireless/ti/wlcore/main.c -@@ -6784,7 +6784,7 @@ int wlcore_probe(struct wl1271 *wl, struct platform_device *pdev) - - if (pdev_data->family && pdev_data->family->nvs_name) { - nvs_name = pdev_data->family->nvs_name; -- ret = request_firmware_nowait(THIS_MODULE, FW_ACTION_HOTPLUG, -+ ret = request_firmware_nowait(THIS_MODULE, FW_ACTION_UEVENT, - nvs_name, &pdev->dev, GFP_KERNEL, - wl, wlcore_nvs_cb); - if (ret < 0) {