From bb1275e786759c12e81c34b7f3aa1ed79da2091b Mon Sep 17 00:00:00 2001 From: Jose Olivera Date: Fri, 7 Feb 2020 00:06:31 +0800 Subject: [PATCH] mwlwifi: Update the 88W8964's firmware to 9.3.2.12 Updates the 88W8964 firmware used in the Linksys WRT3200ACM and WRT32X [v9.3.2.6 -> v9.3.2.12] Removes 0c43219 ("mwlwifi: Fix loading with backports v5.3") as it has been merged upstream. Unfortunately, there is a bug wherein Kaloz's repo, the version detection mechanism for fixing vendor commands doesn't work. It pulls in the Linux kernel version, which as of this time is "4.14.y" or "4.19.y" However, the proper behaviour is that it should pull in the mac80211 backports version which as of now is "5.4-rc8" The included patch works around this by removing the version check. Signed-off-by: Jose Olivera --- package/kernel/mwlwifi/Makefile | 8 ++++---- ...1-Fix-compile-with-mac80211-backports-5_3+.patch} | 12 +++++++----- 2 files changed, 11 insertions(+), 9 deletions(-) rename package/kernel/mwlwifi/patches/{001-vendor_command_policy.patch => 001-Fix-compile-with-mac80211-backports-5_3+.patch} (57%) diff --git a/package/kernel/mwlwifi/Makefile b/package/kernel/mwlwifi/Makefile index aa8eea0450a2e..37232fdb3d4c7 100644 --- a/package/kernel/mwlwifi/Makefile +++ b/package/kernel/mwlwifi/Makefile @@ -8,16 +8,16 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mwlwifi -PKG_RELEASE=2 +PKG_RELEASE=1 PKG_LICENSE:=ISC PKG_LICENSE_FILES:= PKG_SOURCE_URL:=https://github.com/kaloz/mwlwifi PKG_SOURCE_PROTO:=git -PKG_SOURCE_DATE:=2019-03-02 -PKG_SOURCE_VERSION:=31d9386079b91cc699658c19294e139b62b512bc -PKG_MIRROR_HASH:=7bdd05765d8215a9c293cdcb028d63a04c9e55b337eaac9e8d3659bd86218321 +PKG_SOURCE_DATE:=2020-02-06 +PKG_SOURCE_VERSION:=a2fd00bb74c35820dfe233d762690c0433a87ef5 +PKG_MIRROR_HASH:=0eda0e774a87e58e611d6436350e1cf2be3de50fddde334909a07a15b0c9862b PKG_MAINTAINER:=Imre Kaloz PKG_BUILD_PARALLEL:=1 diff --git a/package/kernel/mwlwifi/patches/001-vendor_command_policy.patch b/package/kernel/mwlwifi/patches/001-Fix-compile-with-mac80211-backports-5_3+.patch similarity index 57% rename from package/kernel/mwlwifi/patches/001-vendor_command_policy.patch rename to package/kernel/mwlwifi/patches/001-Fix-compile-with-mac80211-backports-5_3+.patch index 1f06d55fc8a12..00de0ddee5991 100644 --- a/package/kernel/mwlwifi/patches/001-vendor_command_policy.patch +++ b/package/kernel/mwlwifi/patches/001-Fix-compile-with-mac80211-backports-5_3+.patch @@ -1,19 +1,21 @@ -mac80211 from kernel 5.3 and later checks the new policy attribute. - --- a/vendor_cmd.c +++ b/vendor_cmd.c -@@ -92,12 +92,14 @@ static const struct wiphy_vendor_command +@@ -92,18 +92,14 @@ 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, -+ .policy = mwl_vendor_attr_policy, +-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0)) + .policy = mwl_vendor_attr_policy, +-#endif }, { .info = { .vendor_id = MRVL_OUI, .subcmd = MWL_VENDOR_CMD_GET_BF_TYPE}, .flags = WIPHY_VENDOR_CMD_NEED_NETDEV, .doit = mwl_vendor_cmd_get_bf_type, -+ .policy = mwl_vendor_attr_policy, +-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0)) + .policy = mwl_vendor_attr_policy, +-#endif } };