mwlwifi: Update the 88W8964's firmware to 9.3.2.12 and fix backports version detection

[openwrt/openwrt.git] / package / kernel / mwlwifi / patches / 001-Fix-compile-with-mac80211-backports-5_3+.patch

diff --git a/package/kernel/mwlwifi/patches/001-Fix-compile-with-mac80211-backports-5_3+.patch b/package/kernel/mwlwifi/patches/001-Fix-compile-with-mac80211-backports-5_3+.patch
new file mode 100644 (file)
index 0000000..fdba575
--- /dev/null
+++ b/package/kernel/mwlwifi/patches/001-Fix-compile-with-mac80211-backports-5_3+.patch
@@ -0,0 +1,35 @@
+From 182391a3c96ff6ad79bbba0758338a16a66abbd8 Mon Sep 17 00:00:00 2001
+From: DENG Qingfang <dengqf6@mail2.sysu.edu.cn>
+Date: Wed, 12 Feb 2020 14:18:58 +0800
+Subject: [PATCH] Fix driver loading with backports 5.3+
+
+Commit 747796b2f126 did not solve the issue that it crashes when an older kernel
+with a newer backport tries loading it, because it only detects kernel version.
+
+As net/cfg80211.h in 5.3+ defines VENDOR_CMD_RAW_DATA, use it as a condition.
+
+Signed-off-by: DENG Qingfang <dqfext@gmail.com>
+---
+ vendor_cmd.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/vendor_cmd.c
++++ b/vendor_cmd.c
+@@ -92,7 +92,7 @@ static const struct wiphy_vendor_command
+                         .subcmd = MWL_VENDOR_CMD_SET_BF_TYPE},
+               .flags = WIPHY_VENDOR_CMD_NEED_NETDEV,
+               .doit = mwl_vendor_cmd_set_bf_type,
+-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0))
++#ifdef VENDOR_CMD_RAW_DATA
+               .policy = mwl_vendor_attr_policy,
+ #endif
+       },
+@@ -101,7 +101,7 @@ static const struct wiphy_vendor_command
+                         .subcmd = MWL_VENDOR_CMD_GET_BF_TYPE},
+               .flags = WIPHY_VENDOR_CMD_NEED_NETDEV,
+               .doit = mwl_vendor_cmd_get_bf_type,
+-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0))
++#ifdef VENDOR_CMD_RAW_DATA
+               .policy = mwl_vendor_attr_policy,
+ #endif
+       }