From 4e4cc39969ab8046661e5957b4c2bc7f0a250269 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Thu, 21 Sep 2023 14:07:13 +0800 Subject: [PATCH] rtl8812au-ac: fix build for kernel 5.15 Signed-off-by: Tianling Shen (cherry picked from commit e48cf401d9cd489c7418c9af30c1671e69bd05c7) --- package/kernel/rtl8812au-ac/Makefile | 2 +- .../patches/040-wireless-5.8.patch | 20 +++++++++++-------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/package/kernel/rtl8812au-ac/Makefile b/package/kernel/rtl8812au-ac/Makefile index 24a9940f5c..f82c908e1c 100644 --- a/package/kernel/rtl8812au-ac/Makefile +++ b/package/kernel/rtl8812au-ac/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=rtl8812au-ac -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_URL:=https://github.com/aircrack-ng/rtl8812au.git PKG_SOURCE_PROTO:=git diff --git a/package/kernel/rtl8812au-ac/patches/040-wireless-5.8.patch b/package/kernel/rtl8812au-ac/patches/040-wireless-5.8.patch index 165f7abfe9..33be79e391 100644 --- a/package/kernel/rtl8812au-ac/patches/040-wireless-5.8.patch +++ b/package/kernel/rtl8812au-ac/patches/040-wireless-5.8.patch @@ -104,16 +104,20 @@ if (wdev->current_bss) { --- a/os_dep/linux/os_intfs.c +++ b/os_dep/linux/os_intfs.c -@@ -1734,7 +1734,7 @@ int rtw_os_ndev_register(_adapter *adapt - u8 rtnl_lock_needed = rtw_rtnl_lock_needed(dvobj); - - #ifdef CONFIG_RTW_NAPI --#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0) || defined(BUILD_OPENWRT)) +@@ -1737,7 +1737,11 @@ int rtw_os_ndev_register(_adapter *adapt + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) netif_napi_add_weight(ndev, &adapter->napi, rtw_recv_napi_poll, RTL_NAPI_WEIGHT); #else - netif_napi_add(ndev, &adapter->napi, rtw_recv_napi_poll, RTL_NAPI_WEIGHT); -@@ -2794,7 +2794,13 @@ static int netdev_vir_if_close(struct ne +- netif_napi_add(ndev, &adapter->napi, rtw_recv_napi_poll, RTL_NAPI_WEIGHT); ++ netif_napi_add(ndev, &adapter->napi, rtw_recv_napi_poll ++#ifndef BUILD_OPENWRT ++ , RTL_NAPI_WEIGHT ++#endif ++ ); + #endif + #endif /* CONFIG_RTW_NAPI */ + +@@ -2794,7 +2798,13 @@ static int netdev_vir_if_close(struct ne #ifdef CONFIG_IOCTL_CFG80211 wdev->iftype = NL80211_IFTYPE_MONITOR;