diff --git a/88x2bu.conf b/88x2bu.conf index 1d367f2..0e765ab 100644 --- a/88x2bu.conf +++ b/88x2bu.conf @@ -3,19 +3,20 @@ # Purpose: Allow easy access to specific driver options. # # Note: pull-request: wireless-next-2022-12-12 -# wireless-next patches for v6.2 +# wireless-next patches for v6.2 # wifi: rtw88: Add rtw8822bu chipset support -# The following line blacklists the above in-kernel driver. +# +# The following line blacklists (deactivates) the above in-kernel driver. blacklist rtw88_8822bu # # Edit the following line to change, add or delete options: -options 88x2bu rtw_drv_log_level=1 rtw_led_ctrl=1 rtw_vht_enable=1 rtw_switch_usb_mode=0 +options 88x2bu rtw_drv_log_level=1 rtw_led_ctrl=1 rtw_vht_enable=1 rtw_power_mgnt=1 rtw_switch_usb_mode=0 # # Note: To activate USB3 mode, change rtw_switch_usb_mode above to rtw_switch_usb_mode=1 # # Note: The above `options` line is a good default for managed mode. Below is # an example for AP mode. Modify as required after reading the documentation: -#options 88x2bu rtw_drv_log_level=1 rtw_led_ctrl=1 rtw_vht_enable=2 rtw_power_mgnt=1 rtw_dfs_region_domain=1 +#options 88x2bu rtw_drv_log_level=1 rtw_led_ctrl=1 rtw_vht_enable=2 rtw_power_mgnt=1 rtw_beamform_cap=1 rtw_dfs_region_domain=1 # # After editing is complete, save this file (if using nano: Ctrl + x, y, Enter) # and reboot to activate the changes. @@ -72,6 +73,28 @@ options 88x2bu rtw_drv_log_level=1 rtw_led_ctrl=1 rtw_vht_enable=1 rtw_switch_us # # ----- # +# Beamforming options ( rtw_beamform_cap ) +# +# 1 = SU Beamformer (recommended for AP mode) +# 2 = SU Beamformee +# 3 = SU Beamformer and SU Beamformee +# 10= SU Beamformee and MU Beamformee (default) +# 11= SU Beamformer and SU Beamformee and MU Beamformee +# +# Note: MU Beamformer is not supported. +# +# From the source code: +# +# /* /os_dep/linux/os_intfs.c +# * +# * BIT0: Enable VHT SU Beamformer +# * BIT1: Enable VHT SU Beamformee +# * BIT2: Enable VHT MU Beamformer, depend on VHT SU Beamformer (not supported) +# * BIT3: Enable VHT MU Beamformee, depend on VHT SU Beamformee +# */ +# +# ----- +# # USB options: ( rtw_switch_usb_mode ) # # 0 = No switch (default) @@ -158,8 +181,3 @@ options 88x2bu rtw_drv_log_level=1 rtw_led_ctrl=1 rtw_vht_enable=1 rtw_switch_us # vht_capab=[MAX-MPDU-11454][SHORT-GI-80][TX-STBC-2BY1][RX-STBC-1][HTC-VHT][MAX-A-MPDU-LEN-EXP7] # # ----- - - - - - diff --git a/Makefile b/Makefile index 33cedcd..d0fc1a3 100644 --- a/Makefile +++ b/Makefile @@ -71,7 +71,7 @@ CONFIG_USB_HCI = y CONFIG_PCI_HCI = n CONFIG_SDIO_HCI = n CONFIG_GSPI_HCI = n -########################## Features ########################### +######################### Features ############################ CONFIG_AP_MODE = y CONFIG_P2P = y CONFIG_MP_INCLUDED = n diff --git a/core/rtw_beamforming.c b/core/rtw_beamforming.c index 8eda985..7bafe3d 100644 --- a/core/rtw_beamforming.c +++ b/core/rtw_beamforming.c @@ -115,7 +115,7 @@ static void _get_sta_beamform_cap(PADAPTER adapter, struct sta_info *sta, mlme = &adapter->mlmepriv; if (is_supported_ht(sta->wireless_mode) == _FALSE) - return; + goto get_bfcap_next; /* HT */ if (check_fwstate(mlme, WIFI_AP_STATE)) { @@ -154,8 +154,8 @@ static void _get_sta_beamform_cap(PADAPTER adapter, struct sta_info *sta, } } +get_bfcap_next: #ifdef CONFIG_80211AC_VHT - if (is_supported_vht(sta->wireless_mode) == _FALSE) return; diff --git a/include/autoconf.h b/include/autoconf.h index c1aa58f..84caaf5 100644 --- a/include/autoconf.h +++ b/include/autoconf.h @@ -42,8 +42,8 @@ #endif #ifdef CONFIG_80211AC_VHT -/* nrm - activates beamforming */ - /* #define CONFIG_BEAMFORMING */ + /* nrm - activates beamforming */ + #define CONFIG_BEAMFORMING #endif /* set CONFIG_IOCTL_CFG80211 from Makefile */