developer | 43a264f | 2024-03-26 14:09:54 +0800 | [diff] [blame] | 1 | From ad78259cef325771ddf30132bd0c80e4a11b4841 Mon Sep 17 00:00:00 2001 |
developer | 034826d | 2023-11-30 15:52:52 +0800 | [diff] [blame] | 2 | From: Shayne Chen <shayne.chen@mediatek.com> |
| 3 | Date: Mon, 27 Nov 2023 16:39:36 +0800 |
developer | 43a264f | 2024-03-26 14:09:54 +0800 | [diff] [blame] | 4 | Subject: [PATCH 2/3] backports: update kernel version check for |
developer | d243af0 | 2023-12-21 14:49:33 +0800 | [diff] [blame] | 5 | eth_hw_addr_set() |
developer | 034826d | 2023-11-30 15:52:52 +0800 | [diff] [blame] | 6 | |
| 7 | Kernel v5.4.260 has added this API, so update kernel version check in |
| 8 | backports include. |
| 9 | |
developer | 034826d | 2023-11-30 15:52:52 +0800 | [diff] [blame] | 10 | Signed-off-by: Shayne Chen <shayne.chen@mediatek.com> |
developer | 034826d | 2023-11-30 15:52:52 +0800 | [diff] [blame] | 11 | --- |
| 12 | backport-include/linux/etherdevice.h | 4 ++-- |
| 13 | 1 file changed, 2 insertions(+), 2 deletions(-) |
| 14 | |
| 15 | diff --git a/backport-include/linux/etherdevice.h b/backport-include/linux/etherdevice.h |
| 16 | index 51a7d6d..ecc3bc2 100644 |
| 17 | --- a/backport-include/linux/etherdevice.h |
| 18 | +++ b/backport-include/linux/etherdevice.h |
| 19 | @@ -39,7 +39,7 @@ static inline void u64_to_ether_addr(u64 u, u8 *addr) |
| 20 | } |
| 21 | #endif /* LINUX_VERSION_IS_LESS(4,11,0) */ |
| 22 | |
| 23 | -#if LINUX_VERSION_IS_LESS(5,15,0) |
| 24 | +#if LINUX_VERSION_IS_LESS(5,4,260) |
| 25 | /** |
| 26 | * eth_hw_addr_set - Assign Ethernet address to a net_device |
| 27 | * @dev: pointer to net_device structure |
| 28 | @@ -51,7 +51,7 @@ static inline void eth_hw_addr_set(struct net_device *dev, const u8 *addr) |
| 29 | { |
| 30 | ether_addr_copy(dev->dev_addr, addr); |
| 31 | } |
| 32 | -#endif /* LINUX_VERSION_IS_LESS(5,15,0) */ |
| 33 | +#endif /* LINUX_VERSION_IS_LESS(5,4,260) */ |
| 34 | |
| 35 | #if LINUX_VERSION_IS_LESS(5,16,0) |
| 36 | static inline int backport_device_get_mac_address(struct device *dev, char *addr) |
| 37 | -- |
developer | d243af0 | 2023-12-21 14:49:33 +0800 | [diff] [blame] | 38 | 2.18.0 |
| 39 | |