The removed patches were applied upstream. of_get_mac_address() was backported in our OpenWrt kernel, remove the change from backports. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
29 lines
748 B
Diff
29 lines
748 B
Diff
--- a/backport-include/linux/of_net.h
|
|
+++ /dev/null
|
|
@@ -1,26 +0,0 @@
|
|
-#ifndef _BP_OF_NET_H
|
|
-#define _BP_OF_NET_H
|
|
-#include_next <linux/of_net.h>
|
|
-#include <linux/version.h>
|
|
-#include <linux/etherdevice.h>
|
|
-
|
|
-/* 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.
|
|
- */
|
|
-#if LINUX_VERSION_IS_LESS(5,13,0)
|
|
-static inline int backport_of_get_mac_address(struct device_node *np, u8 *mac_out)
|
|
-{
|
|
- const void *mac = of_get_mac_address(np);
|
|
-
|
|
- if (!mac)
|
|
- return -ENODEV;
|
|
- if (IS_ERR(mac))
|
|
- return PTR_ERR(mac);
|
|
- ether_addr_copy(mac_out, mac);
|
|
-
|
|
- return 0;
|
|
-}
|
|
-#define of_get_mac_address LINUX_BACKPORT(of_get_mac_address)
|
|
-#endif /* < 5.2 */
|
|
-
|
|
-#endif /* _BP_OF_NET_H */
|