Merge branch 'cilynx:5.8.7.1_35809.20191129_COEX20191120-7777' into cleanup

Author: sevan

Makefile

@@ -11,6 +11,7 @@ EXTRA_CFLAGS += -Wno-unused-function
 EXTRA_CFLAGS += -Wno-unused-parameter
 EXTRA_CFLAGS += -Wno-unused-variable
 EXTRA_CFLAGS += -Wno-array-bounds
+EXTRA_CFLAGS += -Wno-address
 
 GCC_VER_49 := $(shell echo `$(CC) -dumpversion | cut -f1-2 -d.` \>= 4.9 | bc )
 ifeq ($(GCC_VER_49),1)
@@ -2457,4 +2458,3 @@ clean:
 	rm -fr *.mod.c *.mod *.o .*.cmd *.ko *~
 	rm -fr .tmp_versions *.ur-safe
 endif
-

core/rtw_ap.c

@@ -4399,7 +4399,7 @@ static u8 rtw_ap_update_chbw_by_ifbmp(struct dvobj_priv *dvobj, u8 ifbmp
 	int i;
 
 	for (i = 0; i < dvobj->iface_nums; i++) {
-		if (!(ifbmp & BIT(i)) || !dvobj->padapters)
+		if (!(ifbmp & BIT(i)) || !dvobj->padapters[i])
 			continue;
 
 		iface = dvobj->padapters[i];
@@ -4419,7 +4419,7 @@ static u8 rtw_ap_update_chbw_by_ifbmp(struct dvobj_priv *dvobj, u8 ifbmp
 	}
 
 	for (i = 0; i < dvobj->iface_nums; i++) {
-		if (!(ifbmp & BIT(i)) || !dvobj->padapters)
+		if (!(ifbmp & BIT(i)) || !dvobj->padapters[i])
 			continue;
 
 		iface = dvobj->padapters[i];
@@ -4589,7 +4589,7 @@ u8 rtw_ap_chbw_decision(_adapter *adapter, u8 ifbmp, u8 excl_ifbmp
 
 #ifdef CONFIG_RTW_MESH
 	for (i = 0; i < dvobj->iface_nums; i++)
-		if ((ifbmp & BIT(i)) && dvobj->padapters)
+		if ((ifbmp & BIT(i)) && dvobj->padapters[i])
 			if (!MLME_IS_MESH(dvobj->padapters[i]))
 				break;
 	ifbmp_all_mesh = i >= dvobj->iface_nums ? 1 : 0;

core/rtw_mlme_ext.c

@@ -8997,7 +8997,7 @@ static u32 rtw_append_assoc_req_owe_ie(_adapter *adapter, u8 *pbuf)
 	if (sec == NULL)
 		goto exit;
 
-	if (sec->owe_ie && sec->owe_ie_len > 0) {
+	if (sec->owe_ie_len > 0) {
 		len = sec->owe_ie_len;
 		_rtw_memcpy(pbuf, sec->owe_ie, len);
 	}
@@ -16664,4 +16664,3 @@ int rtw_sae_preprocess(_adapter *adapter, const u8 *buf, u32 len, u8 tx)
 	return _SUCCESS;
 #endif /* CONFIG_IOCTL_CFG80211 */
 }
-

core/rtw_sta_mgt.c

@@ -380,13 +380,13 @@ static void	_rtw_free_sta_recv_priv_lock(struct sta_recv_priv *psta_recvpriv)
 void rtw_mfree_stainfo(struct sta_info *psta);
 void rtw_mfree_stainfo(struct sta_info *psta)
 {
-
-	if (&psta->lock != NULL)
-		_rtw_spinlock_free(&psta->lock);
-
-	_rtw_free_sta_xmit_priv_lock(&psta->sta_xmitpriv);
-	_rtw_free_sta_recv_priv_lock(&psta->sta_recvpriv);
-
+    // Here used to be some calls to helper functions that would call
+    // _rtw_spinlock_free several times. However, _rtw_spinlock_free does not
+    // do anything on Linux. Since this project is concerned only with Linux,
+    // it is safe to remove the calls entirely.
+    // This function is kept. Removing it would force us to remove it in the
+    // callers, which has the danger of becoming incompatible with possible
+    // future patches.
 }
 
 
@@ -1342,4 +1342,3 @@ void dump_pre_link_sta_ctl(void *sel, struct sta_priv *stapriv)
 	}
 }
 #endif /* CONFIG_RTW_PRE_LINK_STA */
-

dkms.conf

@@ -1,6 +1,7 @@
 PACKAGE_NAME="rtl88x2bu"
 PACKAGE_VERSION="5.8.7.1"
-MAKE[0]="'make' KVER=$kernelver src=$source_tree/rtl88x2bu-$PACKAGE_VERSION"
+PROCS_NUM="$(nproc)"
+MAKE[0]="'make' -j $PROCS_NUM KVER=$kernelver src=$source_tree/rtl88x2bu-$PACKAGE_VERSION"
 CLEAN="make clean"
 BUILT_MODULE_NAME[0]="88x2bu"
 DEST_MODULE_LOCATION[0]="/kernel/drivers/net"

os_dep/linux/usb_intf.c

@@ -249,6 +249,8 @@ static struct usb_device_id rtw_usb_id_tbl[] = {
 	{USB_DEVICE_AND_INTERFACE_INFO(0x2357, 0x0138, 0xff, 0xff, 0xff), .driver_info = RTL8822B}, /* TP-Link Archer T3U Plus V1 */
 	{USB_DEVICE_AND_INTERFACE_INFO(0x7392, 0xB822, 0xff, 0xff, 0xff), .driver_info = RTL8822B}, /* Edimax EW-7822ULC */
 	{USB_DEVICE_AND_INTERFACE_INFO(0x7392, 0xC822, 0xff, 0xff, 0xff), .driver_info = RTL8822B}, /* Edimax EW-7822UTC */
+	{USB_DEVICE_AND_INTERFACE_INFO(0x20F4, 0x808A, 0xff, 0xff, 0xff), .driver_info = RTL8822B}, /* TRENDnet TEW-808UBM */
+	{USB_DEVICE_AND_INTERFACE_INFO(0x13b1, 0x0045, 0xff, 0xff, 0xff), .driver_info = RTL8822B}, /* Linksys WUSB3600 v2 */
 #endif /* CONFIG_RTL8822B */
 
 #ifdef CONFIG_RTL8723D