From c86246189c6bf8ace607b5446080f1951375b163 Mon Sep 17 00:00:00 2001 From: Seung-Woo Kim Date: Wed, 9 Jun 2021 18:10:06 +0900 Subject: [PATCH] net: rtl88xx: use null nic_hdl for _init_timer() without checking adapter In linux case, _init_timer() does not use nic_hdl, the 2nd argument, from drivers/net/wireless/rtl8812au/include/osdep_service_linux.h and rlt88xx should register timer even there is null adapter, otherwise interface-up causes mod_timer crash. Change-Id: I30addc152c197e0243b9b58e8108799f0f94330c Fixes: commit 52ddac0afb83 ("net: rtl88xx: fix to check null adapter") Reported-by: Cheoleun Moon Signed-off-by: Seung-Woo Kim --- drivers/net/wireless/rtl8812au/os_dep/osdep_service.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/net/wireless/rtl8812au/os_dep/osdep_service.c b/drivers/net/wireless/rtl8812au/os_dep/osdep_service.c index 36d793d..bed0639 100644 --- a/drivers/net/wireless/rtl8812au/os_dep/osdep_service.c +++ b/drivers/net/wireless/rtl8812au/os_dep/osdep_service.c @@ -1183,11 +1183,8 @@ void rtw_init_timer(_timer *ptimer, void *padapter, void *pfunc, void *ctx) { _adapter *adapter = (_adapter *)padapter; - if (!adapter) - return; - #ifdef PLATFORM_LINUX - _init_timer(ptimer, adapter->pnetdev, pfunc, ctx); + _init_timer(ptimer, NULL, pfunc, ctx); #endif #ifdef PLATFORM_FREEBSD _init_timer(ptimer, adapter->pifp, pfunc, ctx); -- 2.7.4