mirror of https://github.com/armbian/build.git
remove wifi patches for kernel v6.16 merged upstream
This commit is contained in:
amazingfate
Igor
parent
a4010867fa
commit
ff941a6e2d
|
|
@ -41,7 +41,7 @@ driver_rtl8189ES() {
|
|||
if linux-version compare "${version}" ge 3.14; then
|
||||
|
||||
# Attach to specific commit (was "branch:master")
|
||||
local rtl8189esver='commit:7b43c5c7971eabea263dc2b6cc0928b84323f310' # Commit date: 2025-04-30 (please update when updating commit ref)
|
||||
local rtl8189esver='commit:07f03cf721f5e0317012ece4159834327680ba8b' # Commit date: 2025-06-21 (please update when updating commit ref)
|
||||
|
||||
display_alert "Adding" "Wireless drivers for Realtek 8189ES chipsets ${rtl8189esver}" "info"
|
||||
|
||||
|
|
@ -77,9 +77,6 @@ driver_rtl8189ES() {
|
|||
|
||||
# fix compilation for kernels >= 5.4.251
|
||||
process_patch_file "${SRC}/patch/misc/wireless-rtl8189es-Fix-building-on-5.4.251-kernel.patch" "applying"
|
||||
|
||||
# fix compilation for kernels >= 6.16
|
||||
process_patch_file "${SRC}/patch/misc/wireless-rtl8189es-Fix-v6.16.patch" "applying"
|
||||
fi
|
||||
}
|
||||
|
||||
|
|
@ -90,7 +87,7 @@ driver_rtl8189FS() {
|
|||
if linux-version compare "${version}" ge 3.14; then
|
||||
|
||||
# Attach to specific commit (was "branch:rtl8189fs")
|
||||
local rtl8189fsver='commit:06e89edce6817616d963414825dccf87094a7e54' # Commit date: 2025-05-04 (please update when updating commit ref)
|
||||
local rtl8189fsver='commit:d0f15f392570499f3e48f6d157c89cadf393a739' # Commit date: 2025-06-21 (please update when updating commit ref)
|
||||
|
||||
display_alert "Adding" "Wireless drivers for Realtek 8189FS chipsets ${rtl8189fsver}" "info"
|
||||
|
||||
|
|
@ -136,7 +133,7 @@ driver_rtl8192EU() {
|
|||
if linux-version compare "${version}" ge 3.14; then
|
||||
|
||||
# Attach to specific commit (was "branch:realtek-4.4.x")
|
||||
local rtl8192euver='commit:27aa922c298f2be240eec6c2e8636fe865ece195' # Commit date: 2025-05-04 (please update when updating commit ref)
|
||||
local rtl8192euver='commit:c2f491f0e42c438a29b207e96429b4d76c581a03' # Commit date: 2025-06-23 (please update when updating commit ref)
|
||||
|
||||
display_alert "Adding" "Wireless drivers for Realtek 8192EU chipsets ${rtl8192euver}" "info"
|
||||
|
||||
|
|
@ -168,9 +165,6 @@ driver_rtl8192EU() {
|
|||
|
||||
# fix compilation for kernels >= 5.4.251
|
||||
process_patch_file "${SRC}/patch/misc/wireless-rtl8192eu-Fix-building-on-5.4.251-kernel.patch" "applying"
|
||||
|
||||
# fix compilation for kernels >= 6.16
|
||||
process_patch_file "${SRC}/patch/misc/wireless-rtl8192eu-Fix-v6.16.patch" "applying"
|
||||
fi
|
||||
}
|
||||
|
||||
|
|
@ -644,7 +638,7 @@ driver_rtl8723DS() {
|
|||
if linux-version compare "${version}" ge 5.0; then
|
||||
|
||||
# Attach to specific commit (was "branch:master")
|
||||
local rtl8723dsver='commit:86e3c4d2203b7f977d36a17c24efe0549afc6e31' # Commit date: 2025-05-14 (please update when updating commit ref)
|
||||
local rtl8723dsver='commit:09a2b3e94d14cc2a0012d5b74101c6acf1ef0872' # Commit date: 2025-06-28 (please update when updating commit ref)
|
||||
|
||||
display_alert "Adding" "Wireless drivers for Realtek 8723DS chipsets ${rtl8723dsver}" "info"
|
||||
|
||||
|
|
@ -677,9 +671,6 @@ driver_rtl8723DS() {
|
|||
|
||||
# fix compilation for kernels >= 5.4
|
||||
process_patch_file "${SRC}/patch/misc/wireless-rtl8723ds-Fix-VFS-import.patch" "applying"
|
||||
|
||||
# fix compilation for kernels >= 6.16
|
||||
process_patch_file "${SRC}/patch/misc/wireless-rtl8723ds-Fix-v6.16.patch" "applying"
|
||||
fi
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,16 +0,0 @@
|
|||
diff --git a/drivers/net/wireless/rtl8189es/include/osdep_service_linux.h b/drivers/net/wireless/rtl8189es/include/osdep_service_linux.h
|
||||
index 55df7069010..b33f3416159 100644
|
||||
--- a/drivers/net/wireless/rtl8189es/include/osdep_service_linux.h
|
||||
+++ b/drivers/net/wireless/rtl8189es/include/osdep_service_linux.h
|
||||
@@ -370,7 +370,11 @@ static inline void timer_hdl(unsigned long cntx)
|
||||
#endif
|
||||
{
|
||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0))
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 16, 0)
|
||||
+ _timer *ptimer = timer_container_of(ptimer, in_timer, timer);
|
||||
+#else
|
||||
_timer *ptimer = from_timer(ptimer, in_timer, timer);
|
||||
+#endif
|
||||
#else
|
||||
_timer *ptimer = (_timer *)cntx;
|
||||
#endif
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
diff --git a/drivers/net/wireless/rtl8192eu/include/osdep_service_linux.h b/drivers/net/wireless/rtl8192eu/include/osdep_service_linux.h
|
||||
index 1146d8d77d2..6a9f9d7a704 100644
|
||||
--- a/drivers/net/wireless/rtl8192eu/include/osdep_service_linux.h
|
||||
+++ b/drivers/net/wireless/rtl8192eu/include/osdep_service_linux.h
|
||||
@@ -360,7 +360,11 @@ static inline void timer_hdl(unsigned long cntx)
|
||||
#endif
|
||||
{
|
||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0))
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 16, 0)
|
||||
+ _timer *ptimer = timer_container_of(ptimer, in_timer, timer);
|
||||
+#else
|
||||
_timer *ptimer = from_timer(ptimer, in_timer, timer);
|
||||
+#endif
|
||||
#else
|
||||
_timer *ptimer = (_timer *)cntx;
|
||||
#endif
|
||||
|
|
@ -1,280 +0,0 @@
|
|||
diff --git a/drivers/net/wireless/rtl8723ds/core/rtw_p2p.c b/drivers/net/wireless/rtl8723ds/core/rtw_p2p.c
|
||||
index 17cd93a1819..4e1bf442b6a 100644
|
||||
--- a/drivers/net/wireless/rtl8723ds/core/rtw_p2p.c
|
||||
+++ b/drivers/net/wireless/rtl8723ds/core/rtw_p2p.c
|
||||
@@ -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
|
||||
diff --git a/drivers/net/wireless/rtl8723ds/core/rtw_pwrctrl.c b/drivers/net/wireless/rtl8723ds/core/rtw_pwrctrl.c
|
||||
index 2141d29f307..abef8c91b40 100644
|
||||
--- a/drivers/net/wireless/rtl8723ds/core/rtw_pwrctrl.c
|
||||
+++ b/drivers/net/wireless/rtl8723ds/core/rtw_pwrctrl.c
|
||||
@@ -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);
|
||||
|
||||
diff --git a/drivers/net/wireless/rtl8723ds/core/rtw_recv.c b/drivers/net/wireless/rtl8723ds/core/rtw_recv.c
|
||||
index e2f29d213f7..bfc6df6250a 100644
|
||||
--- a/drivers/net/wireless/rtl8723ds/core/rtw_recv.c
|
||||
+++ b/drivers/net/wireless/rtl8723ds/core/rtw_recv.c
|
||||
@@ -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;
|
||||
|
||||
diff --git a/drivers/net/wireless/rtl8723ds/hal/led/hal_sdio_led.c b/drivers/net/wireless/rtl8723ds/hal/led/hal_sdio_led.c
|
||||
index bda1d421c84..b294a14288b 100644
|
||||
--- a/drivers/net/wireless/rtl8723ds/hal/led/hal_sdio_led.c
|
||||
+++ b/drivers/net/wireless/rtl8723ds/hal/led/hal_sdio_led.c
|
||||
@@ -826,7 +826,11 @@ void BlinkTimerCallback(void *data)
|
||||
#endif
|
||||
{
|
||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 16, 0)
|
||||
+ PLED_SDIO pLed = timer_container_of(pLed, t, BlinkTimer);
|
||||
+#else
|
||||
PLED_SDIO pLed = from_timer(pLed, t, BlinkTimer);
|
||||
+#endif
|
||||
#else
|
||||
PLED_SDIO pLed = (PLED_SDIO)data;
|
||||
#endif
|
||||
diff --git a/drivers/net/wireless/rtl8723ds/os_dep/linux/mlme_linux.c b/drivers/net/wireless/rtl8723ds/os_dep/linux/mlme_linux.c
|
||||
index 6509df0aec4..985102bf887 100644
|
||||
--- a/drivers/net/wireless/rtl8723ds/os_dep/linux/mlme_linux.c
|
||||
+++ b/drivers/net/wireless/rtl8723ds/os_dep/linux/mlme_linux.c
|
||||
@@ -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
|
||||
diff --git a/drivers/net/wireless/rtl8723ds/os_dep/linux/recv_linux.c b/drivers/net/wireless/rtl8723ds/os_dep/linux/recv_linux.c
|
||||
index dd64495b792..49b9a70e72d 100644
|
||||
--- a/drivers/net/wireless/rtl8723ds/os_dep/linux/recv_linux.c
|
||||
+++ b/drivers/net/wireless/rtl8723ds/os_dep/linux/recv_linux.c
|
||||
@@ -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
|
||||
Loading…
Reference in New Issue