From 160e644005f4f536954b306291dcfc65d36b7199 Mon Sep 17 00:00:00 2001 From: feriolisara Date: Tue, 5 Dec 2023 09:42:43 +0100 Subject: [PATCH] print values --- Makefile | 6 +++--- core/rtw_debug.c | 4 ++-- core/rtw_recv.c | 21 +++++++-------------- 3 files changed, 12 insertions(+), 19 deletions(-) diff --git a/Makefile b/Makefile index c901c9f..ab9da09 100644 --- a/Makefile +++ b/Makefile @@ -159,9 +159,9 @@ CONFIG_PLATFORM_NV_TK1_UBUNTU = n CONFIG_PLATFORM_RTL8197D = n CONFIG_PLATFORM_AML_S905 = n CONFIG_PLATFORM_ZTE_ZX296716 = n -CONFIG_RTW_HOSTAPD_ACS = n -CONFIG_BACKGROUND_NOISE_MONITOR = n -CONFIG_RTW_DEBUG = n +CONFIG_RTW_HOSTAPD_ACS = y +CONFIG_BACKGROUND_NOISE_MONITOR = y +CONFIG_RTW_DEBUG = y ############################################################### CONFIG_DRVEXT_MODULE = n diff --git a/core/rtw_debug.c b/core/rtw_debug.c index 634c5ad..faba4b8 100644 --- a/core/rtw_debug.c +++ b/core/rtw_debug.c @@ -1429,10 +1429,10 @@ int proc_get_survey_info(struct seq_file *m, void *v) notify_signal = translate_percentage_to_dbm(pnetwork->network.PhyInfo.SignalStrength);/* dbm */ } -#ifdef CONFIG_BACKGROUND_NOISE_MONITOR + #ifdef CONFIG_BACKGROUND_NOISE_MONITOR if (IS_NM_ENABLE(padapter)) notify_noise = rtw_noise_query_by_chan_num(padapter, pnetwork->network.Configuration.DSConfig); -#endif + #endif ie_wpa = rtw_get_wpa_ie(&pnetwork->network.IEs[12], &ielen, pnetwork->network.IELength - 12); ie_wpa2 = rtw_get_wpa2_ie(&pnetwork->network.IEs[12], &ielen, pnetwork->network.IELength - 12); diff --git a/core/rtw_recv.c b/core/rtw_recv.c index 6f678b1..c25821d 100644 --- a/core/rtw_recv.c +++ b/core/rtw_recv.c @@ -4040,7 +4040,6 @@ static sint fill_radiotap_hdr(_adapter *padapter, union recv_frame *precvframe, /* channel flags */ tmp_16bit = 0; - s8 snr = 0; if (pHalData->current_band_type == 0) tmp_16bit |= cpu_to_le16(IEEE80211_CHAN_2GHZ); else @@ -4050,15 +4049,9 @@ static sint fill_radiotap_hdr(_adapter *padapter, union recv_frame *precvframe, if (pattrib->data_rate < 4) { /* CCK */ tmp_16bit |= cpu_to_le16(IEEE80211_CHAN_CCK); - - // understand with value take when CCK - // snr = pattrib->phy_info.rx_snr[0]; } else { /* OFDM */ tmp_16bit |= cpu_to_le16(IEEE80211_CHAN_OFDM); - - // when is OFMD, take the first value of the array for snr - snr = pattrib->phy_info.rx_snr[0]; } } else tmp_16bit |= cpu_to_le16(IEEE80211_CHAN_DYN); @@ -4067,18 +4060,18 @@ static sint fill_radiotap_hdr(_adapter *padapter, union recv_frame *precvframe, /* dBm Antenna Signal */ rtap_hdr->it_present |= (1 << IEEE80211_RADIOTAP_DBM_ANTSIGNAL); - hdr_buf[rt_len] = pattrib->phy_info.recv_signal_power; - + hdr_buf[rt_len] = pattrib->phy_info.recv_signal_power; rt_len += 1; /* dBm Antenna Noise */ rtap_hdr->it_present |= (1 << IEEE80211_RADIOTAP_DBM_ANTNOISE); + + s8 snr = pattrib->phy_info.rx_snr[0]; if (snr == 0) { hdr_buf[rt_len] = 0; } else { hdr_buf[rt_len] = pattrib->phy_info.recv_signal_power - (snr); } - rt_len += 1; /* Signal Quality */ @@ -4087,9 +4080,9 @@ static sint fill_radiotap_hdr(_adapter *padapter, union recv_frame *precvframe, rt_len += 1; /* Antenna */ - //rtap_hdr->it_present |= (1 << IEEE80211_RADIOTAP_ANTENNA); - //hdr_buf[rt_len] = 0; /* pHalData->rf_type; */ - //rt_len += 1; + // rtap_hdr->it_present |= (1 << IEEE80211_RADIOTAP_ANTENNA); + // hdr_buf[rt_len] = 0; /* pHalData->rf_type; */ + // rt_len += 1; /* RX flags */ rtap_hdr->it_present |= (1 << IEEE80211_RADIOTAP_RX_FLAGS); @@ -4097,7 +4090,7 @@ static sint fill_radiotap_hdr(_adapter *padapter, union recv_frame *precvframe, tmp_16bit = cpu_to_le16(0); memcpy(ptr, &tmp_16bit, 1); #endif - rt_len += 2; + rt_len += 1; /* MCS information */ if (pattrib->data_rate >= 12 && pattrib->data_rate < 44) {