Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org --- config/kernel/kernel.config.aarch64-ipfire | 2 +- config/kernel/kernel.config.x86_64-ipfire | 2 +- lfs/linux | 4 ++-- lfs/rtl8812au | 1 + lfs/rtl8822bu | 1 + ...remove_regulatory_ignore_stale_kickoff.patch | 17 +++++++++++++++++ 6 files changed, 23 insertions(+), 4 deletions(-) create mode 100644 src/patches/rtl8812au/remove_regulatory_ignore_stale_kickoff.patch
diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire index bc07256b6..9ad75c92b 100644 --- a/config/kernel/kernel.config.aarch64-ipfire +++ b/config/kernel/kernel.config.aarch64-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.1.38-ipfire Kernel Configuration +# Linux/arm64 6.1.39-ipfire Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.1.0" CONFIG_CC_IS_GCC=y diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire index eeda765dd..e40181dc6 100644 --- a/config/kernel/kernel.config.x86_64-ipfire +++ b/config/kernel/kernel.config.x86_64-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.1.38-ipfire Kernel Configuration +# Linux/x86 6.1.39-ipfire Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.1.0" CONFIG_CC_IS_GCC=y diff --git a/lfs/linux b/lfs/linux index e9a50fba5..75fa0c00f 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,7 +24,7 @@
include Config
-VER = 6.1.38 +VER = 6.1.39
ARM_PATCHES = 6.1.y-ipfire2
@@ -76,7 +76,7 @@ objects = \ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) arm-multi-patches-$(ARM_PATCHES).patch.xz = $(URL_IPFIRE)/arm-multi-patches-$(ARM_PATCHES).patch.xz
-$(DL_FILE)_BLAKE2 = 43f0fe3f8aeb03e5a2bf46b358b8dc4515765b70f56fb136847c78a80889bc2e163768d941500c285f40f705634b5fd3d6e0d81c10521fc351596c95db62490e +$(DL_FILE)_BLAKE2 = 36bb549b14ccff3bd1751ff8475e74a77f8f65d9531ca2379b1dd2ccfe9adcf6852a764d615c42b3ad8a91c0d96668ae970085ab889dd98e21789f54a2f7641e arm-multi-patches-$(ARM_PATCHES).patch.xz_BLAKE2 = 7afc460562fb24bcd75784fc79de768f9b60780aedd88d1a847927169e31920bbb475b1ac1466c4a224a7876d16bd8d465b96202de12b74f6e2ccbfcec731ad3
install : $(TARGET) diff --git a/lfs/rtl8812au b/lfs/rtl8812au index d9cfbe073..e18ba8b5f 100644 --- a/lfs/rtl8812au +++ b/lfs/rtl8812au @@ -77,6 +77,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/rtl8812au/enable_usbmodeswitch.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/rtl8812au/remove_regulatory_ignore_stale_kickoff.patch cd $(DIR_APP) && CONFIG_RTL8812AU=m make $(MAKETUNING) \ -C /lib/modules/$(KVER)-$(VERSUFIX)/build/ M=$(DIR_APP)/ modules
diff --git a/lfs/rtl8822bu b/lfs/rtl8822bu index b7221f101..e6462727e 100644 --- a/lfs/rtl8822bu +++ b/lfs/rtl8822bu @@ -76,6 +76,7 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/rtl8812au/remove_regulatory_ignore_stale_kickoff.patch cd $(DIR_APP) && CONFIG_RTL8822BU=m make $(MAKETUNING) \ -C /lib/modules/$(KVER)-$(VERSUFIX)/build/ M=$(DIR_APP)/ modules
diff --git a/src/patches/rtl8812au/remove_regulatory_ignore_stale_kickoff.patch b/src/patches/rtl8812au/remove_regulatory_ignore_stale_kickoff.patch new file mode 100644 index 000000000..933700049 --- /dev/null +++ b/src/patches/rtl8812au/remove_regulatory_ignore_stale_kickoff.patch @@ -0,0 +1,17 @@ +# This feature was removed in kernel 6.5 and the patch was backported to 6.1.39 + +diff --git a/8812au-20210629-07ac856293e247347b891c5dbd13f3ab8321132d.org/os_dep/linux/wifi_regd.c b/8812au-20210629-07ac856293e247347b891c5dbd13f3ab8321132d/os_dep/linux/wifi_regd.c +index 81e1dc7..b4b0bcd 100644 +--- a/os_dep/linux/wifi_regd.c ++++ b/os_dep/linux/wifi_regd.c +@@ -405,10 +405,6 @@ int rtw_regd_init(struct wiphy *wiphy) + wiphy->regulatory_flags &= ~REGULATORY_DISABLE_BEACON_HINTS; + #endif + +-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0)) +- wiphy->regulatory_flags |= REGULATORY_IGNORE_STALE_KICKOFF; +-#endif +- + return 0; + } + #endif /* CONFIG_IOCTL_CFG80211 */
-
Arne Fitzenreiter