mirrors/rtl8812au-chinawrj
1
0
Fork 0
mirror of https://github.com/chinawrj/rtl8812au synced 2024-11-28 08:04:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #248 from ThijsWithaar/v5.3.4

Browse Source 
Merge changes
This commit is contained in:
Christian B 2018-12-23 11:29:59 +01:00 committed by GitHub
commit c733d47f63
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -167,6 +167,10 @@ ifeq ($(CONFIG_DISABLE_REGD_C), y)
EXTRA_CFLAGS += -DCONFIG_DISABLE_REGD_C EXTRA_CFLAGS += -DCONFIG_DISABLE_REGD_C
endif endif
ifeq ($(CONFIG_MP_VHT_HW_TX_MODE), y)
EXTRA_CFLAGS += -DCONFIG_MP_VHT_HW_TX_MODE
endif
ifeq ($(CONFIG_GSPI_HCI), y) ifeq ($(CONFIG_GSPI_HCI), y)
HCI_NAME = gspi HCI_NAME = gspi
endif endif
@ -372,10 +376,6 @@ endif
########### HAL_RTL8814A ################################# ########### HAL_RTL8814A #################################
ifeq ($(CONFIG_RTL8814A), y) ifeq ($(CONFIG_RTL8814A), y)
## ADD NEW VHT MP HW TX MODE ##
#EXTRA_CFLAGS += -DCONFIG_MP_VHT_HW_TX_MODE
#CONFIG_MP_VHT_HW_TX_MODE = y
##########################################
RTL871X = rtl8814a RTL871X = rtl8814a
ifeq ($(CONFIG_USB_HCI), y) ifeq ($(CONFIG_USB_HCI), y)
MODULE_NAME = 8814au MODULE_NAME = 8814au
@ -1394,6 +1394,7 @@ KSRC := /lib/modules/$(KVER)/build
MODDESTDIR := /lib/modules/$(KVER)/kernel/drivers/net/wireless/ MODDESTDIR := /lib/modules/$(KVER)/kernel/drivers/net/wireless/
INSTALL_PREFIX := INSTALL_PREFIX :=
endif endif
ifeq ($(CONFIG_PLATFORM_ARM_ODROIDC2), y) ifeq ($(CONFIG_PLATFORM_ARM_ODROIDC2), y)
EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN
EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT

2
os_dep/linux/wifi_regd.c
View File

@ -258,6 +258,7 @@ static void _rtw_reg_apply_active_scan_flags(struct wiphy *wiphy,
*/ */
static void _rtw_reg_apply_radar_flags(struct wiphy *wiphy) static void _rtw_reg_apply_radar_flags(struct wiphy *wiphy)
{ {
#ifndef CONFIG_DISABLE_REGD_C
struct ieee80211_supported_band *sband; struct ieee80211_supported_band *sband;
struct ieee80211_channel *ch; struct ieee80211_channel *ch;
unsigned int i; unsigned int i;
@ -304,6 +305,7 @@ static void _rtw_reg_apply_radar_flags(struct wiphy *wiphy)
IEEE80211_CHAN_PASSIVE_SCAN; IEEE80211_CHAN_PASSIVE_SCAN;
#endif #endif
} }
#endif // CONFIG_DISABLE_REGD_C
} }
static void _rtw_reg_apply_flags(struct wiphy *wiphy) static void _rtw_reg_apply_flags(struct wiphy *wiphy)