[bot] AutoMerging: merge all upstream's changes:

* https://github.com/coolsnowwolf/lede:
  mac80211: add rt2x00 5.19 kernel support
  kernel: refresh 5.19 patch (coolsnowwolf#9943)
  kernel: refresh 5.15 patch (coolsnowwolf#9944)
  rockchip: set rockchip_setup_macs for NanoPi R5S
  rockchip: add FriendlyElec NanoPi R5S support
  kernel: remove linux 5.18 support
  rockchip: add dummy dts for build
  mac80211: fix brcm patch 5.15 support
  x86: revert kmod-igb-intel to kmod-igb
  rtl8821cu: fix _rtw_memcpy for kernel 5.19
  rtl8821cu: update to 2022-04-09 (coolsnowwolf#9929)
  mac80211: fix 5.18/5.19 brcm patch
  rockchip: adjust default DMA coherent_pool to 2MiB
  rockchip: move dts to files folder
  rockchip: reorder r66s/p2 eth ports
  rockchip: add smp tune for fastrhino r66s

Author: github-actions[bot]

include/kernel-5.18

@@ -36,7 +36,7 @@ index 44a11b0..178e692 100644
  	ndev->ethtool_ops = &brcmf_ethtool_ops;
 
  	/* set the mac address & netns */
-++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,18,0)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,18,0)
  	memcpy(ndev->dev_addr, ifp->mac_addr, ETH_ALEN);
 +#else
 +	eth_hw_addr_set(ifp->ndev, ifp->mac_addr);
@@ -82,12 +82,15 @@ diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/n
 index 8effeb7..04362e2 100644
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
-@@ -4165,7 +4165,7 @@ static int brcmf_sdio_bus_reset(struct device *dev)
+@@ -4164,7 +4164,11 @@
 
  	/* reset the adapter */
  	sdio_claim_host(sdiodev->func1);
--	mmc_hw_reset(sdiodev->func1->card->host);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,18,0)
+ 	mmc_hw_reset(sdiodev->func1->card->host);
++#else
 +	mmc_hw_reset(sdiodev->func1->card);
++#endif
  	sdio_release_host(sdiodev->func1);
 
  	brcmf_bus_change_state(sdiodev->bus_if, BRCMF_BUS_DOWN);
@@ -117,7 +120,7 @@ index 57aa863..f5ebb5a 100644
  		       local->hw.wiphy->perm_addr,
  		       ETH_ALEN);
 +#else
-+		eth_hw_addr_set(ndev, params->macaddr);
++		eth_hw_addr_set(dev, local->hw.wiphy->perm_addr);
 +#endif
  		memcpy(dev->perm_addr, dev->dev_addr, ETH_ALEN);
 

package/kernel/mac80211/patches/brcm/999-backport-to-linux-5.18.patch

@@ -0,0 +1,21 @@
+--- a/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c
++++ b/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c
+@@ -586,10 +586,18 @@ static void rt2x00usb_assign_endpoint(struct data_queue *queue,
+ 
+ 	if (queue->qid == QID_RX) {
+ 		pipe = usb_rcvbulkpipe(usb_dev, queue->usb_endpoint);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,19,0)
+ 		queue->usb_maxpacket = usb_maxpacket(usb_dev, pipe, 0);
++#else
++		queue->usb_maxpacket = usb_maxpacket(usb_dev, pipe);
++#endif
+ 	} else {
+ 		pipe = usb_sndbulkpipe(usb_dev, queue->usb_endpoint);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,19,0)
+ 		queue->usb_maxpacket = usb_maxpacket(usb_dev, pipe, 1);
++#else
++		queue->usb_maxpacket = usb_maxpacket(usb_dev, pipe);
++#endif
+ 	}
+ 
+ 	if (!queue->usb_maxpacket)

package/kernel/mac80211/patches/rt2x00/999-backport-to-linux-5.18.patch

@@ -13,9 +13,9 @@ PKG_RELEASE:=1
 
 PKG_SOURCE_URL:=https://github.com/brektrou/rtl8821CU.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_DATE:=2021-11-14
-PKG_SOURCE_VERSION:=ef3ff12118a75ea9ca1db8f4806bb0861e4fffef
-PKG_MIRROR_HASH:=2b43a454960dd9f69eb0b3648a73438148e38036bb9cd5e3c57ae5697110c18e
+PKG_SOURCE_DATE:=2022-04-09
+PKG_SOURCE_VERSION:=8c2226a74ae718439d56248bd2e44ccf717086d5
+PKG_MIRROR_HASH:=3353a3bc4c73652eceaab95809aab27c3ae8bbf7e915b73488361a061ba91b84
 
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=LICENSE

package/kernel/rtl8821cu/Makefile

@@ -33,7 +33,7 @@ diff --git a/os_dep/linux/os_intfs.c b/os_dep/linux/os_intfs.c
 index 257c581..f97fa24 100755
 --- a/os_dep/linux/os_intfs.c
 +++ b/os_dep/linux/os_intfs.c
-@@ -1302,6 +1302,14 @@ unsigned int rtw_classify8021d(struct sk_buff *skb)
+@@ -1306,6 +1306,14 @@ unsigned int rtw_classify8021d(struct sk_buff *skb)
  }
 
 
@@ -48,7 +48,7 @@ index 257c581..f97fa24 100755
  static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb
  #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 13, 0)
  	, void *accel_priv
-@@ -1310,6 +1318,7 @@ static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb
+@@ -1314,6 +1322,7 @@ static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb
  	#endif
  #endif
  )

package/kernel/rtl8821cu/patches/040-wireless-5.8.patch

@@ -0,0 +1,44 @@
+From af27791efdde55cdec3b4400c9d1a806c0040e38 Mon Sep 17 00:00:00 2001
+From: Butterfly <[email protected]>
+Date: Tue, 12 Apr 2022 00:31:54 +0300
+Subject: [PATCH] Buildfix for Linux 5.18
+
+Buildfix for Linux 5.18
+Link: https://github.com/brektrou/rtl8821CU/pull/168
+---
+ include/ieee80211.h | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+--- a/include/ieee80211.h
++++ b/include/ieee80211.h
+@@ -1529,18 +1529,30 @@ enum ieee80211_state {
+ 	(((Addr[2]) & 0xff) == 0xff) && (((Addr[3]) & 0xff) == 0xff) && (((Addr[4]) & 0xff) == 0xff) && \
+ 				     (((Addr[5]) & 0xff) == 0xff))
+ #else
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0))
++static inline int is_multicast_mac_addr(const u8 *addr)
++#else
+ extern __inline int is_multicast_mac_addr(const u8 *addr)
++#endif
+ {
+ 	return (addr[0] != 0xff) && (0x01 & addr[0]);
+ }
+ 
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0))
++static inline int is_broadcast_mac_addr(const u8 *addr)
++#else
+ extern __inline int is_broadcast_mac_addr(const u8 *addr)
++#endif
+ {
+ 	return ((addr[0] == 0xff) && (addr[1] == 0xff) && (addr[2] == 0xff) &&   \
+ 		(addr[3] == 0xff) && (addr[4] == 0xff) && (addr[5] == 0xff));
+ }
+ 
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0))
++static inline int is_zero_mac_addr(const u8 *addr)
++#else
+ extern __inline int is_zero_mac_addr(const u8 *addr)
++#endif
+ {
+ 	return ((addr[0] == 0x00) && (addr[1] == 0x00) && (addr[2] == 0x00) &&   \
+ 		(addr[3] == 0x00) && (addr[4] == 0x00) && (addr[5] == 0x00));

package/kernel/rtl8821cu/patches/050-Buildfix-for-Linux-5.18.patch

@@ -0,0 +1,53 @@
+From 7e24201ebdcdbe2d34f5cdfe4065928b381b8d04 Mon Sep 17 00:00:00 2001
+From: Butterfly <[email protected]>
+Date: Tue, 12 Apr 2022 00:05:41 +0300
+Subject: [PATCH 1/2] osdep_service.c: fix warning _rtw_memcpy
+
+osdep_service.c: fix warning _rtw_memcpy
+---
+ os_dep/osdep_service.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/os_dep/osdep_service.c b/os_dep/osdep_service.c
+index d4a01c8..6a2d3ac 100644
+--- a/os_dep/osdep_service.c
++++ b/os_dep/osdep_service.c
+@@ -2491,7 +2491,11 @@ int rtw_change_ifname(_adapter *padapter, const char *ifname)
+ 
+ 	rtw_init_netdev_name(pnetdev, ifname);
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0)
+ 	_rtw_memcpy(pnetdev->dev_addr, adapter_mac_addr(padapter), ETH_ALEN);
++#else
++	dev_addr_set(pnetdev, adapter_mac_addr(padapter));
++#endif
+ 
+ 	if (rtnl_lock_needed)
+ 		ret = register_netdev(pnetdev);
+
+From 924f57d1cce2843aa28d557b74baf00a6482caa8 Mon Sep 17 00:00:00 2001
+From: Butterfly <[email protected]>
+Date: Tue, 12 Apr 2022 00:08:52 +0300
+Subject: [PATCH 2/2] ioctl_linux.c: fix warning _rtw_memcpy
+
+ioctl_linux.c: fix warning _rtw_memcpy
+---
+ os_dep/linux/ioctl_linux.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/os_dep/linux/ioctl_linux.c b/os_dep/linux/ioctl_linux.c
+index 20dd583..a0d32ee 100644
+--- a/os_dep/linux/ioctl_linux.c
++++ b/os_dep/linux/ioctl_linux.c
+@@ -9778,7 +9778,11 @@ static int rtw_mp_efuse_set(struct net_device *dev,
+ 		rtw_hal_read_chip_info(padapter);
+ 		/* set mac addr*/
+ 		rtw_macaddr_cfg(adapter_mac_addr(padapter), get_hal_mac_addr(padapter));
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0)
+ 		_rtw_memcpy(padapter->pnetdev->dev_addr, get_hal_mac_addr(padapter), ETH_ALEN); /* set mac addr to net_device */
++#else
++		dev_addr_set(padapter->pnetdev, get_hal_mac_addr(padapter)); /* set mac addr to net_device */
++#endif
+ 
+ #ifdef CONFIG_P2P
+ 		rtw_init_wifidirect_addrs(padapter, adapter_mac_addr(padapter), adapter_mac_addr(padapter));