diff options
Diffstat (limited to 'package/kernel/mac80211/patches/build')
| -rw-r--r-- | package/kernel/mac80211/patches/build/060-no_local_ssb_bcma.patch | 12 | ||||
| -rw-r--r-- | package/kernel/mac80211/patches/build/070-headers-fix-lockdep_assert_not_held.patch | 39 |
2 files changed, 6 insertions, 45 deletions
diff --git a/package/kernel/mac80211/patches/build/060-no_local_ssb_bcma.patch b/package/kernel/mac80211/patches/build/060-no_local_ssb_bcma.patch index 3967d73fad..19a60d7956 100644 --- a/package/kernel/mac80211/patches/build/060-no_local_ssb_bcma.patch +++ b/package/kernel/mac80211/patches/build/060-no_local_ssb_bcma.patch @@ -1,6 +1,6 @@ --- a/local-symbols +++ b/local-symbols -@@ -421,43 +421,6 @@ USB_VL600= +@@ -428,43 +428,6 @@ USB_VL600= USB_NET_CH9200= USB_NET_AQC111= USB_RTL8153_ECM= @@ -192,7 +192,7 @@ select BRCMUTIL --- a/Kconfig.local +++ b/Kconfig.local -@@ -1267,117 +1267,6 @@ config BACKPORTED_USB_NET_AQC111 +@@ -1288,117 +1288,6 @@ config BACKPORTED_USB_NET_AQC111 config BACKPORTED_USB_RTL8153_ECM tristate default USB_RTL8153_ECM @@ -312,7 +312,7 @@ default USB_ACM --- a/Kconfig.sources +++ b/Kconfig.sources -@@ -7,9 +7,6 @@ source "$BACKPORT_DIR/net/mac80211/Kconf +@@ -9,9 +9,6 @@ source "$BACKPORT_DIR/drivers/bus/mhi/Kc source "$BACKPORT_DIR/drivers/net/wireless/Kconfig" source "$BACKPORT_DIR/drivers/net/usb/Kconfig" @@ -324,9 +324,9 @@ source "$BACKPORT_DIR/drivers/staging/Kconfig" --- a/Makefile.kernel +++ b/Makefile.kernel -@@ -40,8 +40,6 @@ obj-y += compat/ - obj-$(CPTCFG_CFG80211) += net/wireless/ - obj-$(CPTCFG_MAC80211) += net/mac80211/ +@@ -42,8 +42,6 @@ obj-$(CPTCFG_MAC80211) += net/mac80211/ + obj-$(CPTCFG_QRTR) += net/qrtr/ + obj-$(CPTCFG_MHI_BUS) += drivers/bus/mhi/ obj-$(CPTCFG_WLAN) += drivers/net/wireless/ -obj-$(CPTCFG_SSB) += drivers/ssb/ -obj-$(CPTCFG_BCMA) += drivers/bcma/ diff --git a/package/kernel/mac80211/patches/build/070-headers-fix-lockdep_assert_not_held.patch b/package/kernel/mac80211/patches/build/070-headers-fix-lockdep_assert_not_held.patch deleted file mode 100644 index d946efa174..0000000000 --- a/package/kernel/mac80211/patches/build/070-headers-fix-lockdep_assert_not_held.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20=C5=A0tetiar?= <ynezz@true.cz> -Date: Fri, 11 Mar 2022 18:21:04 +0100 -Subject: [PATCH] headers: fix lockdep_assert_not_held() -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -LOCK_STATE_HELD define was omitted during backport of -lockdep_assert_not_held() which leads to build failures of kernels with -CONFIG_LOCKDEP=y: - - backports-5.15.8-1/backport-include/linux/lockdep.h:16:47: error: 'LOCK_STATE_HELD' undeclared (first use in this function) - -Fix it by adding missing LOCK_STATE_HELD define. - -References: https://github.com/openwrt/openwrt/pull/9373 -References: https://lore.kernel.org/backports/20220311194800.452-1-ynezz@true.cz/T/#u -Fixes: af58b27b1b1a ("headers: Add lockdep_assert_not_held()") -Reported-by: Oskari Rauta <oskari.rauta@gmail.com> -Signed-off-by: Petr Štetiar <ynezz@true.cz> ---- - backport-include/linux/lockdep.h | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/backport-include/linux/lockdep.h b/backport-include/linux/lockdep.h -index ed5ea67894e4..842e24b7ff8f 100644 ---- a/backport-include/linux/lockdep.h -+++ b/backport-include/linux/lockdep.h -@@ -11,6 +11,9 @@ struct lockdep_map { }; - - #ifndef lockdep_assert_not_held - #ifdef CONFIG_LOCKDEP -+#ifndef LOCK_STATE_HELD -+#define LOCK_STATE_HELD 1 -+#endif /* LOCK_STATE_HELD */ - #define lockdep_assert_not_held(l) do { \ - WARN_ON(debug_locks && \ - lockdep_is_held(l) == LOCK_STATE_HELD); \ |