[prev in list] [next in list] [prev in thread] [next in thread] 

List:       linux-backports
Subject:    [PATCH 46/47] patches: Remove usage of DMI_PRODUCT_SKU
From:       Hauke Mehrtens <hauke () hauke-m ! de>
Date:       2021-10-19 21:43:19
Message-ID: 20211019214320.2035704-47-hauke () hauke-m ! de
[Download RAW message or body]

The mwifiex driver now uses DMI_PRODUCT_SKU, which was only added with
kernel 4.18. Do not use this on older kernel versions.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 patches/0089-unknown-dmi/mwifiex.patch | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 patches/0089-unknown-dmi/mwifiex.patch

diff --git a/patches/0089-unknown-dmi/mwifiex.patch b/patches/0089-unknown-dmi/mwifiex.patch
new file mode 100644
index 00000000..4bd68825
--- /dev/null
+++ b/patches/0089-unknown-dmi/mwifiex.patch
@@ -0,0 +1,22 @@
+--- a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c
++++ b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c
+@@ -34,7 +34,9 @@ static const struct dmi_system_id mwifie
+ 		.matches = {
+ 			/* match for SKU here due to generic product name "Surface Pro" */
+ 			DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
++#if LINUX_VERSION_IS_GEQ(4,18,0)
+ 			DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "Surface_Pro_1796"),
++#endif
+ 		},
+ 		.driver_data = (void *)QUIRK_FW_RST_D3COLD,
+ 	},
+@@ -43,7 +45,9 @@ static const struct dmi_system_id mwifie
+ 		.matches = {
+ 			/* match for SKU here due to generic product name "Surface Pro" */
+ 			DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
++#if LINUX_VERSION_IS_GEQ(4,18,0)
+ 			DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "Surface_Pro_1807"),
++#endif
+ 		},
+ 		.driver_data = (void *)QUIRK_FW_RST_D3COLD,
+ 	},
-- 
2.30.2

--
To unsubscribe from this list: send the line "unsubscribe backports" in
[prev in list] [next in list] [prev in thread] [next in thread]