Merge pull request #172 from kimocoder/v5.2.20

Merge changes
This commit is contained in:
Christian B 2018-08-12 19:09:16 +02:00 committed by GitHub
commit 4e4810c3cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 7 deletions

View File

@ -180,6 +180,10 @@ ifeq ($(CONFIG_DISABLE_REGD_C), y)
EXTRA_CFLAGS += -DCONFIG_DISABLE_REGD_C
endif
ifeq ($(CONFIG_MP_VHT_HW_TX_MODE), y)
EXTRA_CFLAGS += -DCONFIG_MP_VHT_HW_TX_MODE
#endif
ifeq ($(CONFIG_GSPI_HCI), y)
HCI_NAME = gspi
endif
@ -564,11 +568,6 @@ endif
endif
########### HAL_RTL8814A #################################
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
ifeq ($(CONFIG_USB_HCI), y)
MODULE_NAME = 8814au

View File

@ -3986,8 +3986,8 @@ void init_hal_spec_8814a(_adapter *adapter)
hal_spec->macid_num = MACID_NUM_8814A;
hal_spec->sec_cam_ent_num = SEC_CAM_ENT_NUM_8814A;
hal_spec->sec_cap = SEC_CAP_CHK_BMC;
hal_spec->tx_nss_num = 1;
hal_spec->rx_nss_num = 1;
hal_spec->tx_nss_num = 4;
hal_spec->rx_nss_num = 4;
hal_spec->band_cap = BAND_CAP_8814A;
hal_spec->bw_cap = BW_CAP_8814A;