mirrors/rtl8812au-chinawrj
1
0
Fork 0
mirror of https://github.com/chinawrj/rtl8812au synced 2024-09-19 20:50:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

wifi_regd: regulations are handled by crda, so don't do that here.

Browse Source
This commit is contained in:
Thijs Withaar 2019-06-08 08:35:18 +02:00
parent 2cb491951f
commit 13456a8af1
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -74,6 +74,11 @@ CONFIG_REDUCE_TX_CPU_LOADING = n
CONFIG_BR_EXT = y
CONFIG_TDLS = n
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_APPEND_VENDOR_IE_ENABLE = n
CONFIG_RTW_NAPI = y
@ -181,6 +186,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

11
os_dep/linux/wifi_regd.c
View File

@ -44,7 +44,7 @@ static struct country_code_to_enum_rd allCountries[] = {
/* 2G chan 12 - chan 13, PASSIV SCAN */
#define RTW_2GHZ_CH12_13 \
REG_RULE(2467-10, 2472+10, 40, 0, 20, \
NL80211_RRF_PASSIVE_SCAN)
0)
/* 2G chan 14, PASSIVS SCAN, NO OFDM (B only) */
#define RTW_2GHZ_CH14 \
@ -69,7 +69,7 @@ static struct country_code_to_enum_rd allCountries[] = {
/* 5G chan 36 - chan 165 */
#define RTW_5GHZ_5150_5850 \
REG_RULE(5150-10, 5850+10, 40, 0, 30, \
NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_IBSS)
0)
static const struct ieee80211_regdomain rtw_regdom_rd = {
.n_reg_rules = 3,
@ -104,11 +104,15 @@ void rtw_regd_apply_flags(struct wiphy *wiphy)
ch = &sband->channels[j];
if (ch)
#ifndef CONFIG_DISABLE_REGD_C
ch->flags = IEEE80211_CHAN_DISABLED;
#else
ch->flags = 0;
#endif
}
}
}
#ifndef CONFIG_DISABLE_REGD_C
/* channels apply by channel plans. */
for (i = 0; i < max_chan_nums; i++) {
channel = channel_set[i].ChannelNum;
@ -146,6 +150,7 @@ void rtw_regd_apply_flags(struct wiphy *wiphy)
}
#endif /* CONFIG_DFS */
}
#endif
}
static const struct ieee80211_regdomain *_rtw_regdomain_select(struct