Merge remote-tracking branch 'origin/v5.2.20' into v5.2.20

Makefile

@@ -25,6 +25,9 @@ EXTRA_CFLAGS += -Wno-cast-function-type
 EXTRA_CFLAGS += -Wno-date-time
 EXTRA_CFLAGS += -Wno-misleading-indentation
 EXTRA_CFLAGS += -Wno-uninitialized
+
+####EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE
+EXTRA_CFLAGS += -DCONFIG_USB_TX_AGGREGATION
 CFLAGS += -Wno-declaration-after-statement
 # Relax some warnings from '-Wextra' so we won't get flooded with warnings
 EXTRA_CFLAGS += -Wno-sign-compare
@@ -716,6 +719,9 @@ endif
 ifeq ($(CONFIG_PLATFORM_ARM_RPI), y)
 EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN
 EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
+#EXTRA_CFLAGS += -DCONFIG_XMIT_THREAD_MODE # Currently appears not to work, but could be helpful
+EXTRA_CFLAGS += -DCONFIG_USE_USB_BUFFER_ALLOC_TX
+EXTRA_CFLAGS += -DCONFIG_REDUCE_USB_TX_INT
 ARCH ?= arm
 CROSS_COMPILE ?=
 KVER ?= $(shell uname -r)

hal/rtl8814a/usb/rtl8814au_xmit.c

@@ -374,7 +374,7 @@ s32 rtl8814au_xmit_buf_handler(PADAPTER padapter)
 				, ("%s: bDriverStopped(%s) bSurpriseRemoved(%s)!\n"
 				, __func__
 				, rtw_is_drv_stopped(padapter)?"True":"False"
-				, rtw_is_surprise_removed(padapter)?"True":"False");
+				, rtw_is_surprise_removed(padapter)?"True":"False"));
 		return _FAIL;
 	}
 

os_dep/linux/os_intfs.c

@@ -2638,6 +2638,7 @@ static int netdev_vir_if_close(struct net_device *pnetdev)
 #endif
 
 #ifdef CONFIG_IOCTL_CFG80211
+    struct wireless_dev *wdev = padapter->rtw_wdev;
 	wdev->iftype = NL80211_IFTYPE_MONITOR;
 	wdev->current_bss = NULL;
 	rtw_scan_abort(padapter);

os_dep/linux/usb_ops_linux.c

@@ -223,7 +223,7 @@ int _usbctrl_vendorreq_async_write(struct usb_device *udev, u8 request,
 		reqtype =  REALTEK_USB_VENQT_WRITE;
 	}
 
-	buf = (struct rtl819x_async_write_data *)rtw_zmalloc(sizeof(*buf));
+	buf = (struct rtw_async_write_data *)rtw_zmalloc(sizeof(*buf));
 	if (!buf) {
 		rc = -ENOMEM;
 		goto exit;