From 43c6c987b0dd39a1aaa98d26d546a1d89a4ba902 Mon Sep 17 00:00:00 2001 From: Christian B Date: Sun, 17 Dec 2017 11:54:43 +0100 Subject: [PATCH] Update recv_linux.c --- os_dep/linux/recv_linux.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/os_dep/linux/recv_linux.c b/os_dep/linux/recv_linux.c index fa84bcb..52fbba5 100644 --- a/os_dep/linux/recv_linux.c +++ b/os_dep/linux/recv_linux.c @@ -784,17 +784,10 @@ void rtw_os_read_port(_adapter *padapter, struct recv_buf *precvbuf) } -#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) -void _rtw_reordering_ctrl_timeout_handler(struct timer_list *t) -#else +void _rtw_reordering_ctrl_timeout_handler(void *FunctionContext); void _rtw_reordering_ctrl_timeout_handler(void *FunctionContext) -#endif { -#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) - struct recv_reorder_ctrl *preorder_ctrl = from_timer(preorder_ctrl, t, reordering_ctrl_timer); -#else struct recv_reorder_ctrl *preorder_ctrl = (struct recv_reorder_ctrl *)FunctionContext; -#endif rtw_reordering_ctrl_timeout_handler(preorder_ctrl); } @@ -802,9 +795,5 @@ void rtw_init_recv_timer(struct recv_reorder_ctrl *preorder_ctrl) { _adapter *padapter = preorder_ctrl->padapter; -#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) - timer_setup(&preorder_ctrl->reordering_ctrl_timer, _rtw_reordering_ctrl_timeout_handler, 0); -#else _init_timer(&(preorder_ctrl->reordering_ctrl_timer), padapter->pnetdev, _rtw_reordering_ctrl_timeout_handler, preorder_ctrl); -#endif }