diff mbox series

[46/47] patches: Remove usage of DMI_PRODUCT_SKU

Message ID 20211019214320.2035704-47-hauke@hauke-m.de (mailing list archive)
State New, archived
Headers show
Series backports: Update to kernel 5.15-rc6 | expand

Commit Message

Hauke Mehrtens Oct. 19, 2021, 9:43 p.m. UTC 
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 mbox series

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,
+ 	},