summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOleksandr Suvorov <oleksandr.suvorov@foundries.io>2024-03-19 07:32:07 +0200
committerOleksandr Suvorov <oleksandr.suvorov@foundries.io>2024-03-19 08:11:01 +0200
commit6868fda0c89556410a3dd97ed6f0399f948ea991 (patch)
treea3d9d9a703ebc943b29d02f4ffafe6d19b9d054a
parentf7437c38b912f633be3c0cd2fc8f7917997716dc (diff)
downloadmeta-freescale-6868fda0c89556410a3dd97ed6f0399f948ea991.tar.gz
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 <oleksandr.suvorov@foundries.io>
-rw-r--r--recipes-kernel/kernel-modules/kernel-module-nxp-wlan/0001-moal_cfg80211-remove-dropped-REGULATORY_IGNORE_STALE.patch34
-rw-r--r--recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb7
2 files changed, 3 insertions, 38 deletions
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 5b837310..00000000
--- a/recipes-kernel/kernel-modules/kernel-module-nxp-wlan/0001-moal_cfg80211-remove-dropped-REGULATORY_IGNORE_STALE.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1From 223ec51667cfdc6339b5c74a65c87e0e8ad970b5 Mon Sep 17 00:00:00 2001
2From: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
3Date: Tue, 31 Oct 2023 14:49:12 -0700
4Subject: [PATCH] moal_cfg80211: remove dropped REGULATORY_IGNORE_STALE_KICKOFF
5
6Upstream commit e8c2af660ba0 ("wifi: cfg80211: fix regulatory disconnect with
7OCB/NAN") removed the definition of REGULATORY_IGNORE_STALE_KICKOFF. Fix the
8driver code to indicate Kernel version where it is no longer available.
9
10Link: https://lore.kernel.org/r/20230616222844.2794d1625a26.I8e78a3789a29e6149447b3139df724a6f1b46fc3@changeid
11
12Upstream-Status: Pending
13Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
14Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
15---
16 mxm_wifiex/wlan_src/mlinux/moal_sta_cfg80211.c | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19diff --git a/mxm_wifiex/wlan_src/mlinux/moal_sta_cfg80211.c b/mxm_wifiex/wlan_src/mlinux/moal_sta_cfg80211.c
20index bf39f0e..8a69d32 100644
21--- a/mxm_wifiex/wlan_src/mlinux/moal_sta_cfg80211.c
22+++ b/mxm_wifiex/wlan_src/mlinux/moal_sta_cfg80211.c
23@@ -10357,7 +10357,7 @@ mlan_status woal_register_cfg80211(moal_private *priv)
24 PRINTM(MIOCTL, "Follow countryIE provided by AP.\n");
25 }
26 #endif
27-#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 19, 0)
28+#if (CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 19, 0)) && (CFG80211_VERSION_CODE < KERNEL_VERSION(6, 1, 39))
29 /*REGULATORY_IGNORE_STALE_KICKOFF: the regulatory core will _not_ make
30 * sure all interfaces on this wiphy reside on allowed channels. If this
31 * flag is not set, upon a regdomain change, the interfaces are given a
32--
332.25.1
34
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 d5258e77..0bf6154d 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"
8RPROVIDES:${PN} = "kernel-module-nxp89xx" 8RPROVIDES:${PN} = "kernel-module-nxp89xx"
9RCONFLICTS:${PN} = "kernel-module-nxp89xx" 9RCONFLICTS:${PN} = "kernel-module-nxp89xx"
10 10
11SRCBRANCH = "lf-6.1.22_2.0.0" 11SRCBRANCH = "lf-6.1.55_2.2.0"
12MRVL_SRC ?= "git://github.com/nxp-imx/mwifiex.git;protocol=https" 12MRVL_SRC ?= "git://github.com/nxp-imx/mwifiex.git;protocol=https"
13SRC_URI = "${MRVL_SRC};branch=${SRCBRANCH} \ 13SRC_URI = "${MRVL_SRC};branch=${SRCBRANCH}"
14 file://0001-moal_cfg80211-remove-dropped-REGULATORY_IGNORE_STALE.patch;patchdir=${WORKDIR}/git" 14SRCREV = "952d10f3349426f917636a4560974117eb6eef5b"
15SRCREV = "f1382ccbd34fc22daf504e798745f6cddb702b82"
16 15
17S = "${WORKDIR}/git/mxm_wifiex/wlan_src" 16S = "${WORKDIR}/git/mxm_wifiex/wlan_src"
18 17