mac80211: Fix brcmfmac compile on layerscape/armv8_64b openwrt-18.06
authorHauke Mehrtens <hauke@hauke-m.de>
Wed, 11 Nov 2020 20:09:58 +0000 (21:09 +0100)
committerHauke Mehrtens <hauke@hauke-m.de>
Wed, 11 Nov 2020 20:09:58 +0000 (21:09 +0100)
DMI_PRODUCT_SKU is only available with kernel >= 4.18.

Fixes: 2cd234d96bd7 ("mac80211: brcmfmac: backport important fixes from kernel 5.2")
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
package/kernel/mac80211/patches/478-brcmfmac-add-DMI_PRODUCT_SKU-conditionally.patch [new file with mode: 0644]

diff --git a/package/kernel/mac80211/patches/478-brcmfmac-add-DMI_PRODUCT_SKU-conditionally.patch b/package/kernel/mac80211/patches/478-brcmfmac-add-DMI_PRODUCT_SKU-conditionally.patch
new file mode 100644 (file)
index 0000000..3b1c22b
--- /dev/null
@@ -0,0 +1,22 @@
+--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/dmi.c
++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/dmi.c
+@@ -53,7 +53,9 @@ static const struct dmi_system_id dmi_pl
+               .matches = {
+                       DMI_EXACT_MATCH(DMI_BOARD_VENDOR, "To be filled by O.E.M."),
+                       DMI_EXACT_MATCH(DMI_BOARD_NAME, "Cherry Trail CR"),
++#if LINUX_VERSION_IS_GEQ(4,18,0)
+                       DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "T8"),
++#endif
+                       /* also match on somewhat unique bios-version */
+                       DMI_EXACT_MATCH(DMI_BIOS_VERSION, "1.000"),
+               },
+@@ -64,7 +66,9 @@ static const struct dmi_system_id dmi_pl
+               .matches = {
+                       DMI_EXACT_MATCH(DMI_BOARD_VENDOR, "To be filled by O.E.M."),
+                       DMI_EXACT_MATCH(DMI_BOARD_NAME, "Cherry Trail CR"),
++#if LINUX_VERSION_IS_GEQ(4,18,0)
+                       DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "T11"),
++#endif
+                       /* also match on somewhat unique bios-version */
+                       DMI_EXACT_MATCH(DMI_BIOS_VERSION, "1.000"),
+               },