mirror of
https://github.com/armbian/build
synced 2025-09-24 19:47:06 +07:00
Fix wireless patches introduced in https://github.com/armbian/build/pull/5533
It seems condition was too optimistic so we need to apply additional change.
This commit is contained in:
@@ -16,7 +16,7 @@ index 15255cb..f4ed355 100644
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 0))
|
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 0))
|
||||||
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 251))
|
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 0) && LINUX_VERSION_CODE > KERNEL_VERSION(5, 5, 0)) || LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 251)
|
||||||
/* Porting from linux kernel commits
|
/* Porting from linux kernel commits
|
||||||
48eab831ae8b9f7002a533fa4235eed63ea1f1a3
|
48eab831ae8b9f7002a533fa4235eed63ea1f1a3
|
||||||
3f6cffb8604b537e3d7ea040d7f4368689638eaf
|
3f6cffb8604b537e3d7ea040d7f4368689638eaf
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ index e1daa04..6c6d0d8 100644
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 0))
|
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 0))
|
||||||
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 251))
|
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 0) && LINUX_VERSION_CODE > KERNEL_VERSION(5, 5, 0)) || LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 251)
|
||||||
/* Porting from linux kernel commits
|
/* Porting from linux kernel commits
|
||||||
48eab831ae8b9f7002a533fa4235eed63ea1f1a3
|
48eab831ae8b9f7002a533fa4235eed63ea1f1a3
|
||||||
3f6cffb8604b537e3d7ea040d7f4368689638eaf
|
3f6cffb8604b537e3d7ea040d7f4368689638eaf
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ index 8ade04f..3f8b0fa 100644
|
|||||||
typedef unsigned long systime;
|
typedef unsigned long systime;
|
||||||
|
|
||||||
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 0))
|
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 0))
|
||||||
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 251))
|
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 0) && LINUX_VERSION_CODE > KERNEL_VERSION(5, 5, 0)) || LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 251)
|
||||||
/* Porting from linux kernel v5.15-rc1 48eab831ae8b9f7002a533fa4235eed63ea1f1a3 */
|
/* Porting from linux kernel v5.15-rc1 48eab831ae8b9f7002a533fa4235eed63ea1f1a3 */
|
||||||
static inline void eth_hw_addr_set(struct net_device *dev, const u8 *addr)
|
static inline void eth_hw_addr_set(struct net_device *dev, const u8 *addr)
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user