random-mirrors/amazingfate-rtl8723ds
1
0
Fork 0
mirror of https://github.com/amazingfate/rtl8723ds.git synced 2026-01-28 05:43:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Patch for kernel 6.16

Browse Source 
Downstream pull request from @amazingfate https://github.com/armbian/rtl8723ds/pull/2
This commit is contained in:
Paolo Sabatino
2025-10-01 20:20:12 +02:00
committed by Igor
parent 86e3c4d220
commit 2cdfbde9e6
6 changed files with 84 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
os_dep/linux/mlme_linux.c
View File

@@ -75,7 +75,11 @@ void rtw_join_timeout_handler(void *FunctionContext)
#endif
{
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 16, 0)
_adapter *adapter = timer_container_of(adapter, t, mlmepriv.assoc_timer);
#else
_adapter *adapter = from_timer(adapter, t, mlmepriv.assoc_timer);
#endif
#else
_adapter *adapter = (_adapter *)FunctionContext;
#endif
@@ -90,7 +94,11 @@ void _rtw_scan_timeout_handler(void *FunctionContext)
#endif
{
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 16, 0)
_adapter *adapter = timer_container_of(adapter, t, mlmepriv.scan_to_timer);
#else
_adapter *adapter = from_timer(adapter, t, mlmepriv.scan_to_timer);
#endif
#else
_adapter *adapter = (_adapter *)FunctionContext;
#endif
@@ -105,7 +113,11 @@ void _dynamic_check_timer_handlder(void *FunctionContext)
#endif
{
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 16, 0)
struct dvobj_priv *pdvobj = timer_container_of(pdvobj, t, dynamic_chk_timer);
#else
struct dvobj_priv *pdvobj = from_timer(pdvobj, t, dynamic_chk_timer);
#endif
#else
struct dvobj_priv *pdvobj = (struct dvobj_priv *)FunctionContext;
#endif
@@ -132,7 +144,11 @@ void _rtw_set_scan_deny_timer_hdl(void *FunctionContext)
#endif
{
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 16, 0)
_adapter *adapter = timer_container_of(adapter, t, mlmepriv.set_scan_deny_timer);
#else
_adapter *adapter = from_timer(adapter, t, mlmepriv.set_scan_deny_timer);
#endif
#else
_adapter *adapter = (_adapter *)FunctionContext;
#endif
@@ -350,7 +366,11 @@ void _survey_timer_hdl(void *FunctionContext)
#endif
{
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 16, 0)
_adapter *padapter = timer_container_of(padapter, t, mlmeextpriv.survey_timer);
#else
_adapter *padapter = from_timer(padapter, t, mlmeextpriv.survey_timer);
#endif
#else
_adapter *padapter = (_adapter *)FunctionContext;
#endif
@@ -365,7 +385,11 @@ void _link_timer_hdl(void *FunctionContext)
#endif
{
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 16, 0)
_adapter *padapter = timer_container_of(padapter, t, mlmeextpriv.link_timer);
#else
_adapter *padapter = from_timer(padapter, t, mlmeextpriv.link_timer);
#endif
#else
_adapter *padapter = (_adapter *)FunctionContext;
#endif
@@ -380,7 +404,11 @@ void _ft_link_timer_hdl(void *FunctionContext)
#endif
{
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 16, 0)
_adapter *padapter = timer_container_of(padapter, t, mlmeextpriv.ft_link_timer);
#else
_adapter *padapter = from_timer(padapter, t, mlmeextpriv.ft_link_timer);
#endif
#else
_adapter *padapter = (_adapter *)FunctionContext;
#endif
@@ -395,7 +423,11 @@ void _ft_roam_timer_hdl(void *FunctionContext)
#endif
{
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 16, 0)
_adapter *padapter = timer_container_of(padapter, t, mlmeextpriv.ft_roam_timer);
#else
_adapter *padapter = from_timer(padapter, t, mlmeextpriv.ft_roam_timer);
#endif
#else
_adapter *padapter = (_adapter *)FunctionContext;
#endif
@@ -411,7 +443,11 @@ void _addba_timer_hdl(void *FunctionContext)
#endif
{
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 16, 0)
struct sta_info *psta = timer_container_of(psta, t, addba_retry_timer);
#else
struct sta_info *psta = from_timer(psta, t, addba_retry_timer);
#endif
#else
struct sta_info *psta = (struct sta_info *)FunctionContext;
#endif

4
os_dep/linux/recv_linux.c
View File

@@ -866,7 +866,11 @@ void _rtw_reordering_ctrl_timeout_handler(void *FunctionContext)
#endif
{
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 16, 0)
struct recv_reorder_ctrl *preorder_ctrl = timer_container_of(preorder_ctrl, t, reordering_ctrl_timer);
#else
struct recv_reorder_ctrl *preorder_ctrl = from_timer(preorder_ctrl, t, reordering_ctrl_timer);
#endif
#else
struct recv_reorder_ctrl *preorder_ctrl = (struct recv_reorder_ctrl *)FunctionContext;
#endif