From 6868fda0c89556410a3dd97ed6f0399f948ea991 Mon Sep 17 00:00:00 2001 From: Oleksandr Suvorov Date: Tue, 19 Mar 2024 07:32:07 +0200 Subject: kernel-module-nxp-wlan: Update to 6.1.55-2.2.0 Remove obsolete patch, the issue is fixed in commit 952d10f. Relevant changes: - 952d10f mxm_wifiex: update to mxm6x17423.p6 release - 983c073 mxm_wifiex: update to mxm6x17423.p1 release - defde68 mxm_wifiex: fix L6.1.55 kernel build break - 0f0c339 mxm_wifiex: fix L6.6 kernel next tree build errors - 26246bf mxm_wifiex: update to mxm6x17408.p2 release - 297d1ac mxm_wifiex: fix next-20230804 Linux Factory rebase build errors - bcbbab1 mxm_wifiex: fix L6.5 kernel build errors - 19732f5 mxm_wifiex: update to mxm6x17408 release Signed-off-by: Oleksandr Suvorov --- ...11-remove-dropped-REGULATORY_IGNORE_STALE.patch | 34 ---------------------- .../kernel-modules/kernel-module-nxp-wlan_git.bb | 7 ++--- 2 files changed, 3 insertions(+), 38 deletions(-) delete mode 100644 recipes-kernel/kernel-modules/kernel-module-nxp-wlan/0001-moal_cfg80211-remove-dropped-REGULATORY_IGNORE_STALE.patch diff --git a/recipes-kernel/kernel-modules/kernel-module-nxp-wlan/0001-moal_cfg80211-remove-dropped-REGULATORY_IGNORE_STALE.patch b/recipes-kernel/kernel-modules/kernel-module-nxp-wlan/0001-moal_cfg80211-remove-dropped-REGULATORY_IGNORE_STALE.patch deleted file mode 100644 index 5b8373103..000000000 --- a/recipes-kernel/kernel-modules/kernel-module-nxp-wlan/0001-moal_cfg80211-remove-dropped-REGULATORY_IGNORE_STALE.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 223ec51667cfdc6339b5c74a65c87e0e8ad970b5 Mon Sep 17 00:00:00 2001 -From: Andrey Zhizhikin -Date: Tue, 31 Oct 2023 14:49:12 -0700 -Subject: [PATCH] moal_cfg80211: remove dropped REGULATORY_IGNORE_STALE_KICKOFF - -Upstream commit e8c2af660ba0 ("wifi: cfg80211: fix regulatory disconnect with -OCB/NAN") removed the definition of REGULATORY_IGNORE_STALE_KICKOFF. Fix the -driver code to indicate Kernel version where it is no longer available. - -Link: https://lore.kernel.org/r/20230616222844.2794d1625a26.I8e78a3789a29e6149447b3139df724a6f1b46fc3@changeid - -Upstream-Status: Pending -Signed-off-by: Andrey Zhizhikin -Signed-off-by: Tom Hochstein ---- - mxm_wifiex/wlan_src/mlinux/moal_sta_cfg80211.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mxm_wifiex/wlan_src/mlinux/moal_sta_cfg80211.c b/mxm_wifiex/wlan_src/mlinux/moal_sta_cfg80211.c -index bf39f0e..8a69d32 100644 ---- a/mxm_wifiex/wlan_src/mlinux/moal_sta_cfg80211.c -+++ b/mxm_wifiex/wlan_src/mlinux/moal_sta_cfg80211.c -@@ -10357,7 +10357,7 @@ mlan_status woal_register_cfg80211(moal_private *priv) - PRINTM(MIOCTL, "Follow countryIE provided by AP.\n"); - } - #endif --#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 19, 0) -+#if (CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 19, 0)) && (CFG80211_VERSION_CODE < KERNEL_VERSION(6, 1, 39)) - /*REGULATORY_IGNORE_STALE_KICKOFF: the regulatory core will _not_ make - * sure all interfaces on this wiphy reside on allowed channels. If this - * flag is not set, upon a regdomain change, the interfaces are given a --- -2.25.1 - diff --git a/recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb b/recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb index d5258e77a..0bf6154d0 100644 --- a/recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb +++ b/recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb @@ -8,11 +8,10 @@ RREPLACES:${PN} = "kernel-module-nxp89xx" RPROVIDES:${PN} = "kernel-module-nxp89xx" RCONFLICTS:${PN} = "kernel-module-nxp89xx" -SRCBRANCH = "lf-6.1.22_2.0.0" +SRCBRANCH = "lf-6.1.55_2.2.0" MRVL_SRC ?= "git://github.com/nxp-imx/mwifiex.git;protocol=https" -SRC_URI = "${MRVL_SRC};branch=${SRCBRANCH} \ - file://0001-moal_cfg80211-remove-dropped-REGULATORY_IGNORE_STALE.patch;patchdir=${WORKDIR}/git" -SRCREV = "f1382ccbd34fc22daf504e798745f6cddb702b82" +SRC_URI = "${MRVL_SRC};branch=${SRCBRANCH}" +SRCREV = "952d10f3349426f917636a4560974117eb6eef5b" S = "${WORKDIR}/git/mxm_wifiex/wlan_src" -- cgit v1.2.3-54-g00ecf