From d2b8153730314060098df8c5c24c1305c3d5e867 Mon Sep 17 00:00:00 2001 From: kimocoder Date: Tue, 21 May 2019 23:13:01 +0200 Subject: [PATCH 1/3] Get frame bandwidth from phy_info for RTL8814AU --- core/rtw_recv.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/core/rtw_recv.c b/core/rtw_recv.c index dc2e856..ee51ced 100644 --- a/core/rtw_recv.c +++ b/core/rtw_recv.c @@ -4082,9 +4082,16 @@ static sint fill_radiotap_hdr(_adapter *padapter, union recv_frame *precvframe, hdr_buf[rt_len] |= BIT1; /* MCS index known */ /* bandwidth */ +#ifdef CONFIG_RTL8814A + if(pattrib->physt) { + hdr_buf[rt_len] |= BIT0; + hdr_buf[rt_len+1] |= (pattrib->phy_info.band_width & 0x03); + } +#else hdr_buf[rt_len] |= BIT0; hdr_buf[rt_len + 1] |= (pattrib->bw & 0x03); +#endif /* guard interval */ hdr_buf[rt_len] |= BIT2; hdr_buf[rt_len + 1] |= (pattrib->sgi & 0x01) << 2; @@ -4397,10 +4404,10 @@ int recv_func(_adapter *padapter, union recv_frame *rframe) #endif ret = _SUCCESS; goto exit; - } else - + } else { /* check if need to handle uc_swdec_pending_queue*/ - if (check_fwstate(mlmepriv, WIFI_STATION_STATE) && psecuritypriv->busetkipkey) { + if (check_fwstate(mlmepriv, WIFI_STATION_STATE) && psecuritypriv->busetkipkey) + { union recv_frame *pending_frame; int cnt = 0; @@ -4412,9 +4419,11 @@ int recv_func(_adapter *padapter, union recv_frame *rframe) if (cnt) RTW_INFO(FUNC_ADPT_FMT" dequeue %d from uc_swdec_pending_queue\n", - FUNC_ADPT_ARG(padapter), cnt); + FUNC_ADPT_ARG(padapter), cnt); + } } + DBG_COUNTER(padapter->rx_logs.core_rx); ret = recv_func_prehandle(padapter, rframe); From f2298e305f632b1acc941b0381810c8f4a029dd4 Mon Sep 17 00:00:00 2001 From: kimocoder Date: Tue, 21 May 2019 23:17:24 +0200 Subject: [PATCH 2/3] 8812au fix: Use HAL methods to apply TX power settings --- dkms.conf | 2 +- hal/rtl8812a/rtl8812a_phycfg.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dkms.conf b/dkms.conf index 1d70c91..5e62558 100644 --- a/dkms.conf +++ b/dkms.conf @@ -1,5 +1,5 @@ PACKAGE_NAME="realtek-rtl88xxau" -PACKAGE_VERSION="5.3.4~20190406" +PACKAGE_VERSION="5.3.4~20190407" CLEAN="'make' clean" BUILT_MODULE_NAME[0]=88XXau PROCS_NUM=`nproc` diff --git a/hal/rtl8812a/rtl8812a_phycfg.c b/hal/rtl8812a/rtl8812a_phycfg.c index 2ad12da..c5df1b6 100644 --- a/hal/rtl8812a/rtl8812a_phycfg.c +++ b/hal/rtl8812a/rtl8812a_phycfg.c @@ -473,6 +473,8 @@ PHY_GetTxPowerLevel8812( OUT s32 *powerlevel ) { + HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); + *powerlevel = pHalData->CurrentTxPwrIdx; #if 0 HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); PMGNT_INFO pMgntInfo = &(Adapter->MgntInfo); From a87ad2ecbc482ca09803ecd77a8e77e39f941a6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Bremv=C3=A5g?= Date: Fri, 24 May 2019 18:54:44 +0200 Subject: [PATCH 3/3] Update travis.yml --- .travis.yml | 78 ++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 62 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7621ea3..e756aaa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,12 +3,13 @@ compiler: gcc sudo: required before_install: + - sudo apt-get clean + - sudo apt-get update + - sudo apt-get install dpkg - export ALL_DEB=$(wget --quiet -O - ${KERNEL_URL}v${KVER}/ | grep -o 'href=".*"' | grep -m1 all | cut -d '"' -f 2) - export KVER_BUILD=$(echo $ALL_DEB | cut -d '_' -f 1 | cut -c15-) - wget ${KERNEL_URL}v${KVER}/$(wget --quiet -O - ${KERNEL_URL}v${KVER}/ | grep -o 'href=".*"' | grep headers | grep generic | grep -m1 amd64 | cut -d '"' -f 2) - wget ${KERNEL_URL}v${KVER}/$ALL_DEB - - sudo apt-get update - - sudo apt-get install -y dpkg # to upgrade to dpkg >= 1.17.5ubuntu5.8, which fixes https://bugs.launchpad.net/ubuntu/+source/dpkg/+bug/1730627 - sudo dpkg -i *.deb script: @@ -30,7 +31,7 @@ matrix: - gcc-5 - libelf-dev - libssl1.1 - env: COMPILER=gcc-5 KVER=4.20-rc1 + env: COMPILER=gcc-5 KVER=5.0 - compiler: gcc addons: apt: @@ -41,7 +42,7 @@ matrix: - gcc-6 - libelf-dev - libssl1.1 - env: COMPILER=gcc-6 KVER=4.19.1 + env: COMPILER=gcc-6 KVER=5.0 - compiler: gcc addons: apt: @@ -52,7 +53,7 @@ matrix: - gcc-7 - libelf-dev - libssl1.1 - env: COMPILER=gcc-7 KVER=4.19.1 + env: COMPILER=gcc-7 KVER=5.0 - compiler: gcc addons: apt: @@ -60,7 +61,61 @@ matrix: - ubuntu-toolchain-r-test packages: - gcc-5 - env: COMPILER=gcc-5 KVER=4.4.97 + - libelf-dev + env: COMPILER=gcc-5 KVER=4.15 + - compiler: gcc + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - gcc-6 + - libelf-dev + env: COMPILER=gcc-6 KVER=4.15 + - compiler: gcc + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - gcc-7 + - libelf-dev + env: COMPILER=gcc-7 KVER=4.15 + - compiler: gcc + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - gcc-5 + - libelf-dev + env: COMPILER=gcc-5 KVER=4.14.16 + - compiler: gcc + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - gcc-6 + - libelf-dev + env: COMPILER=gcc-6 KVER=4.14.16 + - compiler: gcc + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - gcc-7 + - libelf-dev + env: COMPILER=gcc-7 KVER=4.14.16 + - compiler: gcc + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - gcc-6 + env: COMPILER=gcc-6 KVER=4.9.51 - compiler: gcc addons: apt: @@ -68,13 +123,4 @@ matrix: - ubuntu-toolchain-r-test packages: - gcc-4.9 - env: COMPILER=gcc-4.9 KVER=3.16.50 - - compiler: gcc - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - gcc-5 - env: COMPILER=gcc-5 KVER=3.14.79 - +env: COMPILER=gcc-4.9 KVER=3.16.48