mirror of
https://github.com/Telecominfraproject/wlan-ap.git
synced 2025-10-29 01:22:25 +00:00
61 lines
1.9 KiB
Diff
61 lines
1.9 KiB
Diff
From 7d1503f1fb878bf27aa1bfa15d81394eaf8888d0 Mon Sep 17 00:00:00 2001
|
|
From: John Crispin <john@phrozen.org>
|
|
Date: Mon, 13 Sep 2021 13:42:00 +0200
|
|
Subject: [PATCH] mac80211: fix builds on ath79 targets
|
|
|
|
Signed-off-by: John Crispin <john@phrozen.org>
|
|
---
|
|
.../100-backport_of_get_mac_address.patch | 40 +++++++++++++++++++
|
|
1 file changed, 40 insertions(+)
|
|
create mode 100644 package/kernel/mac80211/patches/build/100-backport_of_get_mac_address.patch
|
|
|
|
diff --git a/package/kernel/mac80211/patches/build/100-backport_of_get_mac_address.patch b/package/kernel/mac80211/patches/build/100-backport_of_get_mac_address.patch
|
|
new file mode 100644
|
|
index 0000000000..79c2343522
|
|
--- /dev/null
|
|
+++ b/package/kernel/mac80211/patches/build/100-backport_of_get_mac_address.patch
|
|
@@ -0,0 +1,40 @@
|
|
+--- a/backport-include/linux/of_net.h
|
|
++++ b/backport-include/linux/of_net.h
|
|
+@@ -2,6 +2,7 @@
|
|
+ #define _BP_OF_NET_H
|
|
+ #include_next <linux/of_net.h>
|
|
+ #include <linux/version.h>
|
|
++#include <linux/etherdevice.h>
|
|
+
|
|
+ #ifndef CONFIG_OF
|
|
+ #if LINUX_VERSION_IS_LESS(3,10,0)
|
|
+@@ -12,18 +13,23 @@ static inline const void *of_get_mac_add
|
|
+ #endif
|
|
+ #endif
|
|
+
|
|
+-/* The behavior of of_get_mac_address() changed in kernel 5.2, it now
|
|
+- * returns an error code and not NULL in case of an error.
|
|
++/* The behavior of of_get_mac_address() changed in kernel 5.15, it now
|
|
++ * accepts an argument with the destination buffer to copy the address to
|
|
+ */
|
|
+-#if LINUX_VERSION_IS_LESS(5,2,0)
|
|
+-static inline const void *backport_of_get_mac_address(struct device_node *np)
|
|
++#if LINUX_VERSION_IS_LESS(5,15,0)
|
|
++static inline int backport_of_get_mac_address(struct device_node *np, u8 *addr)
|
|
+ {
|
|
+ const void *mac = of_get_mac_address(np);
|
|
+
|
|
++ if (IS_ERR(mac))
|
|
++ return PTR_ERR(mac);
|
|
++
|
|
+ if (!mac)
|
|
+- return ERR_PTR(-ENODEV);
|
|
++ return -ENODEV;
|
|
++
|
|
++ memcpy(addr, mac, ETH_ALEN);
|
|
+
|
|
+- return mac;
|
|
++ return 0;
|
|
+ }
|
|
+ #define of_get_mac_address LINUX_BACKPORT(of_get_mac_address)
|
|
+ #endif /* < 5.2 */
|
|
--
|
|
2.25.1
|
|
|