various updates

88x2bu.conf

@@ -68,11 +68,11 @@ options 88x2bu rtw_drv_log_level=0 rtw_led_ctrl=1 rtw_vht_enable=1 rtw_switch_us
 #
 # Beamforming options ( rtw_beamform_cap )
 #
-# 0 = Disable (default)
+# 0 = Disable
 # 1 = SU Beamformer
 # 2 = SU Beamformee
 # 3 = SU Beamformer and SU Beamformee
-# 10= SU Beamformee and MU Beamformee
+# 10= SU Beamformee and MU Beamformee (default)
 # 11= SU Beamformer and SU Beamformee and MU Beamformee
 #
 # Note: MU Beamformer is not supported.

Makefile

@@ -75,7 +75,6 @@ CONFIG_GSPI_HCI = n
 CONFIG_AP_MODE = y
 CONFIG_P2P = y
 CONFIG_MP_INCLUDED = n
-CONFIG_CONCURRENT_MODE = n
 CONFIG_POWER_SAVING = y
 CONFIG_IPS_MODE = default
 CONFIG_LPS_MODE = default
@@ -83,7 +82,7 @@ CONFIG_USB_AUTOSUSPEND = n
 CONFIG_HW_PWRP_DETECTION = n
 CONFIG_BT_COEXIST = y
 CONFIG_WAPI_SUPPORT = n
-CONFIG_EFUSE_CONFIG_FILE = y
+CONFIG_EFUSE_CONFIG_FILE = n
 CONFIG_EXT_CLK = n
 CONFIG_TRAFFIC_PROTECT = n
 CONFIG_LOAD_PHY_PARA_FROM_FILE = y
@@ -99,7 +98,7 @@ CONFIG_SIGNAL_SCALE_MAPPING = n
 CONFIG_80211W = y
 CONFIG_REDUCE_TX_CPU_LOADING = n
 CONFIG_BR_EXT = y
-CONFIG_TDLS = n
+CONFIG_TDLS = y
 CONFIG_WIFI_MONITOR = y
 CONFIG_MCC_MODE = n
 CONFIG_APPEND_VENDOR_IE_ENABLE = n
@@ -1394,7 +1393,7 @@ EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
 SUBARCH := $(shell uname -m | sed -e s/i.86/i386/)
 ARCH ?= $(SUBARCH)
 CROSS_COMPILE ?=
-KVER  := $(shell uname -r)
+KVER := $(shell uname -r)
 KSRC := /lib/modules/$(KVER)/build
 MODDESTDIR := /lib/modules/$(KVER)/kernel/drivers/net/wireless/
 INSTALL_PREFIX :=

README.md

@@ -48,7 +48,7 @@ confirm that this is the correct driver for your adapter.
 ### Compatible Kernels
 
 - Kernels: 4.19 - 5.11 (Realtek)
-- Kernels: 5.12 - 6.1  (community support)
+- Kernels: 5.12 - 6.2  (community support)
 
 ### Tested Compilers
 
@@ -81,7 +81,7 @@ be provided via PR or message in Issues.
 
 - SkiffOS for Odroid XU4 (ARM 32 bit) (kernel 6.0.7)
 
-- Ubuntu 22.04 (kernel 5.15) and 22.10 (kernel 5.19)
+- Ubuntu 22.04 (kernel 5.15) and 22.10 (kernel 5.19) (kernel 6.2 rc1)
 
 - Void Linux (kernel 5.18)
 
@@ -90,10 +90,10 @@ supported due to the way kernel patches are handled. I will support
 knowledgable RHEL developers if they want to merge the required
 support and keep it current.
 
-Note: Android is not supported but I will support knowledgable Android
+Note: Android is supported in the driver according to Realtek. I will support
-developers if they want to merge and keep current the required support
+knowledgable Android developers if they want to merge and keep current the
-(most likely just instructions about how to compile and maybe a modification
+required support (most likely just instructions about how to compile and maybe
-or two to the Makefile). 
+a modification or two to the Makefile).
 
 
 ### Download Locations for Tested Linux Distributions
@@ -120,7 +120,7 @@ or two to the Makefile).
 
 ### Compatible Devices
 
-Warning: If you are looking for information about what adapter to buy,
+Note: If you are looking for information about what adapter to buy,
 click [here](https://github.com/morrownr/USB-WiFi) and look for Main Menu
 item 2 which will show information about and links to recommended adapters.
 
@@ -217,7 +217,7 @@ If it is not set, you will likely have problems accessing some channels, especia
 5 Ghz and 6 GHz channels. To set your Country Code:
 
 ```
-iw reg set US
+sudo iw reg set US
 ```
 
 If you are not in the US, please use the country code for your country. See:

docs/Concurrent_Mode.md

@@ -1,4 +1,4 @@
-2022-11-15
+2022-12-27
 
 What is Concurrent Mode?
 
@@ -10,7 +10,7 @@ single WiFi adapter.
 
 For example:
 
-Use station mode (called managed or client mode also) to connect with an
+Use station mode (also called managed or client mode) to connect with an
 AP to access the internet at the same time as it also performs as an AP
 to allow other devices to connect to the second interface.
 
@@ -35,13 +35,13 @@ nano Makefile
 Change the following line:
 
 ```
-CONFIG_CONCURRENT_MODE = n
+#EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE
 ```
 
 to 
 
 ```
-CONFIG_CONCURRENT_MODE = y
+EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE
 ```
 
 and then install the driver per the installation steps. If
@@ -50,10 +50,15 @@ the driver is already installed, run the following first:
 ```
 sudo ./remove-driver.sh
 ```
+and then reinstall the driver with:
+
+```
+sudo ./install-driver.sh
+```
 
 Once the driver is fully installed and you have rebooted the system, you
-can verify that this works by typing the “iw dev” command, You should
+can verify that this works by typing the “iw dev” command. You should
-see two wireless interfaces, and the MAC address of secondary interface
+see two wireless interfaces, and the MAC address of the secondary interface
 is nearly the same as the first except for one digit.
 
 -----

include/autoconf.h

@@ -42,7 +42,8 @@
 #endif
 
 #ifdef CONFIG_80211AC_VHT
-	#define CONFIG_BEAMFORMING
+/* nrm - activates beamforming */
+	/* #define CONFIG_BEAMFORMING */
 #endif
 
 /* set CONFIG_IOCTL_CFG80211 from Makefile */

remove-driver.sh

@@ -16,7 +16,7 @@
 # GNU General Public License for more details.
 
 SCRIPT_NAME="remove-driver.sh"
-SCRIPT_VERSION="20221218"
+SCRIPT_VERSION="20221228"
 MODULE_NAME="88x2bu"
 DRV_VERSION="5.13.1"
 
@@ -57,23 +57,44 @@ do
 done
 
 # displays script name and version
-echo "Running ${SCRIPT_NAME} version ${SCRIPT_VERSION}"
+echo "Script:  ${SCRIPT_NAME} version ${SCRIPT_VERSION}"
 
-# check for and remove non-dkms installation
+# check for and remove non-dkms installations
+# standard naming
 if [[ -f "${MODDESTDIR}${MODULE_NAME}.ko" ]]
 then
-	echo "Removing a non-dkms installation."
+	echo "Removing a non-dkms installation: ${MODDESTDIR}${MODULE_NAME}.ko"
 	rm -f ${MODDESTDIR}${MODULE_NAME}.ko
 	/sbin/depmod -a ${KVER}
 fi
 
+# check for and remove non-dkms installations
+# with rtl added to module name (PClinuxOS)
+if [[ -f "${MODDESTDIR}rtl${MODULE_NAME}.ko" ]]
+then
+	echo "Removing a non-dkms installation: ${MODDESTDIR}rtl${MODULE_NAME}.ko"
+	rm -f ${MODDESTDIR}rtl${MODULE_NAME}.ko
+	/sbin/depmod -a ${KVER}
+fi
+
+# check for and remove non-dkms installations
+# with compressed module in a unique non-standard location (Armbian)
+# Example: /usr/lib/modules/5.15.80-rockchip64/kernel/drivers/net/wireless/rtl8821cu/8821cu.ko.xz
+# Dear Armbiam, this is a really bad idea.
+if [[ -f "/usr/lib/modules/${KVER}/kernel/drivers/net/wireless/${DRV_NAME}/${MODULE_NAME}.ko.xz" ]]
+then
+	echo "Removing a non-dkms installation: /usr/lib/modules/${KVER}/kernel/drivers/net/wireless/${DRV_NAME}/${MODULE_NAME}.ko.xz"
+	rm -f /usr/lib/modules/${KVER}/kernel/drivers/net/wireless/${DRV_NAME}/${MODULE_NAME}.ko.xz
+	/sbin/depmod -a ${KVER}
+fi
+
 # information that helps with bug reports
 
 # display kernel version
-echo "Linux Kernel=${KVER}"
+echo "Kernel:  ${KVER}"
 
 # display architecture
-echo "CPU Architecture=${KARCH}"
+echo "Arch:  ${KARCH}"
 
 # determine if dkms is installed and run the appropriate routines
 if command -v dkms >/dev/null 2>&1
@@ -94,7 +115,7 @@ then
 			echo "${DRV_NAME}/${DRV_VERSION} has been removed"
 		fi
 	else
-		echo "An error occurred. dkms remove error = ${RESULT}"
+		echo "An error occurred. dkms remove error:  ${RESULT}"
 		echo "Please report this error."
 		exit $RESULT
 	fi
@@ -108,7 +129,7 @@ make clean >/dev/null 2>&1
 echo "The driver was removed successfully."
 echo "You may now delete the driver directory if desired."
 
-# if NoPrompt is not used, ask user some questions to complete removal
+# if NoPrompt is not used, ask user some questions
 if [ $NO_PROMPT -ne 1 ]
 then
 	read -p "Do you want to reboot now? (recommended) [y/N] " -n 1 -r