random-mirrors/amazingfate-rtl8723ds
1
0
Fork 0
mirror of https://github.com/amazingfate/rtl8723ds.git synced 2026-01-27 05:13:17 +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

28
core/rtw_p2p.c
View File

@@ -3377,7 +3377,11 @@ static void ro_ch_timer_process(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, wdinfo.reset_ch_sitesurvey);
#else
_adapter *adapter = from_timer(adapter, t, wdinfo.reset_ch_sitesurvey);
#endif
#else
_adapter *adapter = (_adapter *)FunctionContext;
#endif
@@ -4534,7 +4538,11 @@ static void reset_ch_sitesurvey_timer_process(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, wdinfo.reset_ch_sitesurvey2);
#else
_adapter *adapter = from_timer(adapter, t, wdinfo.reset_ch_sitesurvey2);
#endif
#else
_adapter *adapter = (_adapter *)FunctionContext;
#endif
@@ -4561,7 +4569,11 @@ static void reset_ch_sitesurvey_timer_process2 (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, wdinfo.reset_ch_sitesurvey2);
#else
_adapter *adapter = from_timer(adapter, t, wdinfo.reset_ch_sitesurvey2);
#endif
#else
_adapter *adapter = (_adapter *)FunctionContext;
#endif
@@ -4588,7 +4600,11 @@ static void restore_p2p_state_timer_process (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, wdinfo.restore_p2p_state_timer);
#else
_adapter *adapter = from_timer(adapter, t, wdinfo.restore_p2p_state_timer);
#endif
#else
_adapter *adapter = (_adapter *)FunctionContext;
#endif
@@ -4607,7 +4623,11 @@ static void pre_tx_scan_timer_process(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, wdinfo.pre_tx_scan_timer);
#else
_adapter *adapter = from_timer(adapter, t, wdinfo.pre_tx_scan_timer);
#endif
#else
_adapter *adapter = (_adapter *)FunctionContext;
#endif
@@ -4648,8 +4668,12 @@ static void find_phase_timer_process(struct timer_list *t)
{
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
_adapter *adapter = (_adapter *)FunctionContext;
#else
#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 16, 0)
_adapter *adapter = timer_container_of(adapter, t, wdinfo.find_phase_timer);
#else
_adapter *adapter = from_timer(adapter, t, wdinfo.find_phase_timer);
#endif
#endif
struct wifidirect_info *pwdinfo = &adapter->wdinfo;
@@ -4669,7 +4693,11 @@ void ap_p2p_switch_timer_process (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, wdinfo.ap_p2p_switch_timer);
#else
_adapter *adapter = from_timer(adapter, t, wdinfo.ap_p2p_switch_timer);
#endif
#else
_adapter *adapter = (_adapter *)FunctionContext;
#endif

8
core/rtw_pwrctrl.c
View File

@@ -401,8 +401,12 @@ void pwr_state_check_handler(struct timer_list *t)
{
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
_adapter *padapter = (_adapter *)FunctionContext;
#else
#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 16, 0)
struct pwrctrl_priv *pwrpriv = timer_container_of(pwrpriv, t, pwr_state_check_timer);
#else
struct pwrctrl_priv *pwrpriv = from_timer(pwrpriv, t, pwr_state_check_timer);
#endif
_adapter *padapter = pwrpriv->padapter;
#endif
rtw_ps_cmd(padapter);
@@ -1455,8 +1459,12 @@ static void pwr_rpwm_timeout_handler(struct timer_list *t)
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
PADAPTER padapter = (PADAPTER)FunctionContext;
struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter);
#else
#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 16, 0)
struct pwrctrl_priv *pwrpriv = timer_container_of(pwrpriv, t, pwr_rpwm_timer);
#else
struct pwrctrl_priv *pwrpriv = from_timer(pwrpriv, t, pwr_rpwm_timer);
#endif
#endif
RTW_INFO("+%s: rpwm=0x%02X cpwm=0x%02X\n", __func__, pwrpriv->rpwm, pwrpriv->cpwm);

4
core/rtw_recv.c
View File

@@ -4186,8 +4186,12 @@ void rtw_signal_stat_timer_hdl(struct timer_list *t)
{
#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0))
_adapter *adapter = (_adapter *)FunctionContext;
#else
#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 16, 0)
_adapter *adapter = timer_container_of(adapter, t, recvpriv.signal_stat_timer);
#else
_adapter *adapter = from_timer(adapter, t, recvpriv.signal_stat_timer);
#endif
#endif
struct recv_priv *recvpriv = &adapter->recvpriv;