Merge pull request #1 from fariouche/v5.3.4

added regd flag to disable radar detection
This commit is contained in:
Christian B 2018-09-16 18:19:26 +02:00 committed by GitHub
commit 3ba0d97eae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 5 deletions

View File

@ -172,6 +172,10 @@ CONFIG_DRVEXT_MODULE = n
export TopDIR ?= $(shell pwd)
########### COMMON #################################
ifeq ($(CONFIG_DISABLE_REGD_C), y)
EXTRA_CFLAGS += -DCONFIG_DISABLE_REGD_C
endif
ifeq ($(CONFIG_GSPI_HCI), y)
HCI_NAME = gspi
endif

View File

@ -1,5 +1,5 @@
PACKAGE_NAME="realtek-rtl88xxau"
PACKAGE_VERSION="5.2.20.2~20180829"
PACKAGE_VERSION="5.2.20.2~20180812"
CLEAN="'make' clean"
BUILT_MODULE_NAME[0]=88XXau
PROCS_NUM=`nproc`

View File

@ -8880,12 +8880,12 @@ static void rtw_cfg80211_init_ht_capab_ex(_adapter *padapter
case RF_2T2R:
case RF_1T2R:
ht_cap->cap |= IEEE80211_HT_CAP_RX_STBC_1R;/* Only one spatial-stream STBC RX is supported */
ht_cap->cap |= IEEE80211_HT_CAP_RX_STBC_2R;/* Only one spatial-stream STBC RX is supported */
break;
case RF_3T3R:
case RF_3T4R:
case RF_4T4R:
ht_cap->cap |= IEEE80211_HT_CAP_RX_STBC_1R;/* Only one spatial-stream STBC RX is supported */
ht_cap->cap |= IEEE80211_HT_CAP_RX_STBC_3R;/* Only one spatial-stream STBC RX is supported */
break;
default:
RTW_INFO("[warning] rf_type %d is not expected\n", rf_type);

View File

@ -174,7 +174,7 @@ int rtw_bw_mode = CONFIG_RTW_CUSTOMIZE_BWMODE;
int rtw_bw_mode = 0x21;
#endif
int rtw_ampdu_enable = 1;/* for enable tx_ampdu , */ /* 0: disable, 0x1:enable */
int rtw_rx_stbc = 1;/* 0: disable, bit(0):enable 2.4g, bit(1):enable 5g, default is set to enable 2.4GHZ for IOT issue with bufflao's AP at 5GHZ */
int rtw_rx_stbc = 3;/* 0: disable, bit(0):enable 2.4g, bit(1):enable 5g, default is set to enable 2.4GHZ for IOT issue with bufflao's AP at 5GHZ */
#if (defined(CONFIG_RTL8814A) || defined(CONFIG_RTL8822B)) && defined(CONFIG_PCI_HCI)
int rtw_rx_ampdu_amsdu = 2;/* 0: disabled, 1:enabled, 2:auto . There is an IOT issu with DLINK DIR-629 when the flag turn on */
#else

View File

@ -529,6 +529,7 @@ static struct country_code_to_enum_rd *_rtw_regd_find_country(u16 countrycode)
int rtw_regd_init(_adapter *padapter)
{
#ifndef CONFIG_DISABLE_REGD_C
struct wiphy *wiphy = padapter->rtw_wdev->wiphy;
#if 0
@ -547,7 +548,7 @@ int rtw_regd_init(_adapter *padapter)
#endif
_rtw_regd_init_wiphy(NULL, wiphy);
#endif
return 0;
}
#endif /* CONFIG_IOCTL_CFG80211 */