Merge pull request #359 from Gen5551/realtek-4.4.x

Fix: add extern mac_pton for Linux Kernel 7.0-RC1 compatibility
This commit is contained in:
Carlos Garcés
2026-03-13 20:53:39 +01:00
committed by GitHub
4 changed files with 10 additions and 3 deletions

View File

@@ -1356,7 +1356,6 @@ exit:
pmptx->stop = 1;
thread_exit(NULL);
return 0;
}
void fill_txdesc_for_mp(PADAPTER padapter, u8 *ptxdesc)

View File

@@ -315,7 +315,7 @@ static __inline void thread_enter(char *name)
allow_signal(SIGTERM);
#endif
}
void thread_exit(_completion *comp);
__noreturn void thread_exit(_completion *comp);
void _rtw_init_completion(_completion *comp);
void _rtw_wait_for_comp_timeout(_completion *comp);
void _rtw_wait_for_comp(_completion *comp);

View File

@@ -14,6 +14,8 @@
*****************************************************************************/
#define _IOCTL_LINUX_C_
#include <net/mac80211.h>
#include <drv_types.h>
#include <rtw_mp.h>
#include <rtw_mp_ioctl.h>
@@ -22,6 +24,12 @@
#include "../../hal/hal_halmac.h"
#endif
#ifdef __KERNEL__
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(7, 0, 0))
extern int mac_pton(const char *s, u8 *addr);
#endif
#endif
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 27))
#define iwe_stream_add_event(a, b, c, d, e) iwe_stream_add_event(b, c, d, e)
#define iwe_stream_add_point(a, b, c, d, e) iwe_stream_add_point(b, c, d, e)

View File

@@ -872,7 +872,7 @@ u32 _rtw_down_sema(_sema *sema)
}
inline void thread_exit(_completion *comp)
__noreturn inline void thread_exit(_completion *comp)
{
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0)
complete_and_exit(comp, 0);