From 9e66187e88c37b76b1d4050d1339979873ec2699 Mon Sep 17 00:00:00 2001 From: kimocoder Date: Thu, 14 Feb 2019 17:58:41 +0100 Subject: [PATCH] Quiet the logs --- include/rtw_debug.h | 37 ------------------------------------- os_dep/linux/os_intfs.c | 15 ++++++++++++--- 2 files changed, 12 insertions(+), 40 deletions(-) diff --git a/include/rtw_debug.h b/include/rtw_debug.h index c8e1b7d..f0dfab0 100644 --- a/include/rtw_debug.h +++ b/include/rtw_debug.h @@ -28,24 +28,6 @@ enum { #define DRIVER_PREFIX "RTW: " -#ifdef PLATFORM_OS_CE -extern void rtl871x_cedbg(const char *fmt, ...); -#endif - -#ifdef PLATFORM_WINDOWS - #define RTW_PRINT do {} while (0) - #define RTW_ERR do {} while (0) - #define RTW_WARN do {} while (0) - #define RTW_INFO do {} while (0) - #define RTW_DBG do {} while (0) - #define RTW_PRINT_SEL do {} while (0) - #define _RTW_PRINT do {} while (0) - #define _RTW_ERR do {} while (0) - #define _RTW_WARN do {} while (0) - #define _RTW_INFO do {} while (0) - #define _RTW_DBG do {} while (0) - #define _RTW_PRINT_SEL do {} while (0) -#else #define RTW_PRINT(x, ...) do {} while (0) #define RTW_ERR(x, ...) do {} while (0) #define RTW_WARN(x,...) do {} while (0) @@ -58,7 +40,6 @@ extern void rtl871x_cedbg(const char *fmt, ...); #define _RTW_INFO(x,...) do {} while (0) #define _RTW_DBG(x,...) do {} while (0) #define _RTW_PRINT_SEL(x,...) do {} while (0) -#endif #define RTW_INFO_DUMP(_TitleString, _HexData, _HexDataLen) do {} while (0) #define RTW_DBG_DUMP(_TitleString, _HexData, _HexDataLen) do {} while (0) @@ -68,32 +49,14 @@ extern void rtl871x_cedbg(const char *fmt, ...); #define RTW_DBGDUMP 0 /* 'stream' for _dbgdump */ - - #undef _dbgdump #undef _seqdump -#if defined(PLATFORM_WINDOWS) && defined(PLATFORM_OS_XP) - #define _dbgdump DbgPrint - #define KERN_CONT - #define _seqdump(sel, fmt, arg...) _dbgdump(fmt, ##arg) -#elif defined(PLATFORM_WINDOWS) && defined(PLATFORM_OS_CE) - #define _dbgdump rtl871x_cedbg - #define KERN_CONT - #define _seqdump(sel, fmt, arg...) _dbgdump(fmt, ##arg) -#elif defined PLATFORM_LINUX #define _dbgdump printk #if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24)) #define KERN_CONT #endif #define _seqdump seq_printf -#elif defined PLATFORM_FREEBSD - #define _dbgdump printf - #if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24)) - #define KERN_CONT - #endif - #define _seqdump(sel, fmt, arg...) _dbgdump(fmt, ##arg) -#endif void RTW_BUF_DUMP_SEL(uint _loglevel, void *sel, u8 *_titlestring, bool _idx_show, const u8 *_hexdata, int _hexdatalen); diff --git a/os_dep/linux/os_intfs.c b/os_dep/linux/os_intfs.c index 28a1eee..bcd29d6 100644 --- a/os_dep/linux/os_intfs.c +++ b/os_dep/linux/os_intfs.c @@ -2302,9 +2302,6 @@ u8 rtw_init_drv_sw(_adapter *padapter) /* add for CONFIG_IEEE80211W, none 11w also can use */ _rtw_spinlock_init(&padapter->security_key_mutex); - /* We don't need to memset padapter->XXX to zero, because adapter is allocated by rtw_zvmalloc(). */ - /* _rtw_memset((unsigned char *)&padapter->securitypriv, 0, sizeof (struct security_priv)); */ - if (_rtw_init_sta_priv(&padapter->stapriv) == _FAIL) { RTW_INFO("Can't _rtw_init_sta_priv\n"); ret8 = _FAIL; @@ -2392,6 +2389,8 @@ void rtw_cancel_dynamic_chk_timer(_adapter *padapter) void rtw_cancel_all_timer(_adapter *padapter) { + struct wifidirect_info *pwdinfo = &padapter->wdinfo; + struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; _cancel_timer_ex(&padapter->mlmepriv.assoc_timer); @@ -2434,7 +2433,17 @@ void rtw_cancel_all_timer(_adapter *padapter) _cancel_timer_ex(&(adapter_to_pwrctl(padapter)->pwr_rpwm_timer)); #endif /* CONFIG_LPS_RPWM_TIMER */ + _cancel_timer_ex(&pwdinfo->find_phase_timer); + _cancel_timer_ex(&pwdinfo->restore_p2p_state_timer); + _cancel_timer_ex(&pwdinfo->pre_tx_scan_timer); + _cancel_timer_ex(&pwdinfo->reset_ch_sitesurvey); + _cancel_timer_ex(&pmlmeext->survey_timer); + _cancel_timer_ex(&pmlmeext->link_timer); +#ifdef CONFIG_IEEE80211W + _cancel_timer_ex(&pmlmeext->sa_query_timer); /* cancel dm timer */ +#endif + rtw_hal_dm_deinit(padapter); #ifdef CONFIG_PLATFORM_FS_MX61