Added switch to turn ON/OFF regdomain settings

This commit is contained in:
kimocoder 2018-07-02 19:32:58 +02:00
parent d0bdfd92df
commit 24585a51d2
2 changed files with 11 additions and 1 deletions

View File

@ -69,6 +69,11 @@ CONFIG_REDUCE_TX_CPU_LOADING = n
CONFIG_BR_EXT = y CONFIG_BR_EXT = y
CONFIG_TDLS = n CONFIG_TDLS = n
CONFIG_WIFI_MONITOR = y CONFIG_WIFI_MONITOR = y
# If you are setting up AP (e.g. by hostapd) in 802.11ac mode, you may have to choose 'y' below.
# Otherwise some channels may be flagged 'NO-IR' (i.e. Passive scanning) by the driver.
# Please check your country's regulatory domain first,
# to see whether active scanning is permitted by law/regulations on the desired channels.
CONFIG_DISABLE_REGD_C=y
CONFIG_MCC_MODE = n CONFIG_MCC_MODE = n
CONFIG_APPEND_VENDOR_IE_ENABLE = n CONFIG_APPEND_VENDOR_IE_ENABLE = n
CONFIG_RTW_NAPI = y CONFIG_RTW_NAPI = y
@ -160,6 +165,10 @@ CONFIG_DRVEXT_MODULE = n
export TopDIR ?= $(shell pwd) export TopDIR ?= $(shell pwd)
########### COMMON ################################# ########### COMMON #################################
ifeq ($(CONFIG_DISABLE_REGD_C), y)
EXTRA_CFLAGS += -DCONFIG_DISABLE_REGD_C
endif
ifeq ($(CONFIG_GSPI_HCI), y) ifeq ($(CONFIG_GSPI_HCI), y)
HCI_NAME = gspi HCI_NAME = gspi
endif endif

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) int rtw_regd_init(_adapter *padapter)
{ {
#ifndef CONFIG_DISABLE_REGD_C
struct wiphy *wiphy = padapter->rtw_wdev->wiphy; struct wiphy *wiphy = padapter->rtw_wdev->wiphy;
#if 0 #if 0
@ -547,7 +548,7 @@ int rtw_regd_init(_adapter *padapter)
#endif #endif
_rtw_regd_init_wiphy(NULL, wiphy); _rtw_regd_init_wiphy(NULL, wiphy);
#endif
return 0; return 0;
} }
#endif /* CONFIG_IOCTL_CFG80211 */ #endif /* CONFIG_IOCTL_CFG80211 */