diff --git a/package/kernel/rtl8723bs-ol/Makefile b/package/kernel/rtl8723bs-ol/Makefile index a3f2e6b4ac1aab..187ce34f5e79e5 100644 --- a/package/kernel/rtl8723bs-ol/Makefile +++ b/package/kernel/rtl8723bs-ol/Makefile @@ -6,11 +6,11 @@ PKG_RELEASE=1 PKG_LICENSE:=GPLv2 PKG_LICENSE_FILES:= -PKG_SOURCE_URL:=https://github.com/openlumi/rtl8723bs.git -PKG_MIRROR_HASH:=841b928880340e983db657beb123e104e06cc75ff75c19afe83c52e7d176a5ac +PKG_SOURCE_URL:=https://github.com/openlumi/rtl8822bs-aml +PKG_MIRROR_HASH:=skip PKG_SOURCE_PROTO:=git -PKG_SOURCE_DATE:=2023-06-13 -PKG_SOURCE_VERSION:=04a0bd2edd1ca95b30f8ff47f59624e1277fadf1 +PKG_SOURCE_DATE:=2023-11-24 +PKG_SOURCE_VERSION:=927ce72af82243edb72adda29220c765b93fa1ec PKG_MAINTAINER:=Ivan Belokobylskiy PKG_BUILD_PARALLEL:=1 diff --git a/package/kernel/rtl8723bs-ol/patches/001-use-kernel-byteorder.patch b/package/kernel/rtl8723bs-ol/patches/001-use-kernel-byteorder.patch index f89f1d472aac9b..468e04f5c2b562 100644 --- a/package/kernel/rtl8723bs-ol/patches/001-use-kernel-byteorder.patch +++ b/package/kernel/rtl8723bs-ol/patches/001-use-kernel-byteorder.patch @@ -5,11 +5,11 @@ of the byteorder headers. --- a/include/drv_types.h +++ b/include/drv_types.h @@ -25,7 +25,7 @@ - #include "drv_conf.h" - #include "basic_types.h" - #include "osdep_service.h" --#include "rtw_byteorder.h" + #include + #include + #include +-#include +#include - #include "wlan_bssdef.h" - #include "wifi.h" - #include "ieee80211.h" + #include + #include + #include diff --git a/package/kernel/rtl8723bs-ol/patches/002-kernel-6.1.patch b/package/kernel/rtl8723bs-ol/patches/002-kernel-6.1.patch deleted file mode 100644 index 3166d22d944f40..00000000000000 --- a/package/kernel/rtl8723bs-ol/patches/002-kernel-6.1.patch +++ /dev/null @@ -1,99 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -14,6 +14,7 @@ EXTRA_CFLAGS += -Wno-unused-label - EXTRA_CFLAGS += -Wno-unused-parameter - EXTRA_CFLAGS += -Wno-unused-function - EXTRA_CFLAGS += -Wno-unused -+EXTRA_CFLAGS += -Wno-address - #EXTRA_CFLAGS += -Wno-uninitialized - - GCC_VER_49 := $(shell echo `$(CC) -dumpversion | cut -f1-2 -d.` \>= 4.9 | bc ) ---- a/os_dep/linux/ioctl_cfg80211.c -+++ b/os_dep/linux/ioctl_cfg80211.c -@@ -331,9 +331,7 @@ static const struct ieee80211_txrx_stype - static u64 rtw_get_systime_us(void) - { - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 20, 0)) -- ktime_t ts; -- ts = ktime_get_boottime(); -- return do_div(ts, 1000); -+ return (u64)ktime_to_us(ktime_get_boottime()); - #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39)) - struct timespec ts; - get_monotonic_boottime(&ts); -@@ -744,7 +742,7 @@ check_bss: - #endif - - #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) -- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 0, 0)) -+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 0, 0) || defined(BUILD_OPENWRT)) - roam_info.links[0].bssid = cur_network->network.MacAddress; - #else - roam_info.bssid = cur_network->network.MacAddress; -@@ -1390,7 +1388,7 @@ exit: - } - - static int cfg80211_rtw_add_key(struct wiphy *wiphy, struct net_device *ndev, --#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0) || defined(BUILD_OPENWRT)) - int link_id, - #endif - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) || defined(COMPAT_KERNEL_RELEASE) -@@ -1530,7 +1528,7 @@ addkey_end: - } - - static int cfg80211_rtw_get_key(struct wiphy *wiphy, struct net_device *ndev, --#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0) || defined(BUILD_OPENWRT)) - int link_id, - #endif - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) || defined(COMPAT_KERNEL_RELEASE) -@@ -1565,7 +1563,7 @@ static int cfg80211_rtw_get_key(struct w - } - - static int cfg80211_rtw_del_key(struct wiphy *wiphy, struct net_device *ndev, --#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0) || defined(BUILD_OPENWRT)) - int link_id, - #endif - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) || defined(COMPAT_KERNEL_RELEASE) -@@ -1589,7 +1587,7 @@ static int cfg80211_rtw_del_key(struct w - - static int cfg80211_rtw_set_default_key(struct wiphy *wiphy, - struct net_device *ndev --#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0) || defined(BUILD_OPENWRT)) - , int link_id - #endif - , u8 key_index -@@ -4243,7 +4241,7 @@ static int cfg80211_rtw_change_beacon(st - return ret; - } - --#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 2)) -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 2) || defined(BUILD_OPENWRT)) - static int cfg80211_rtw_stop_ap(struct wiphy *wiphy, struct net_device *ndev, unsigned int link_id) - #else - static int cfg80211_rtw_stop_ap(struct wiphy *wiphy, struct net_device *ndev) -@@ -7356,7 +7354,7 @@ void rtw_wdev_unregister(struct wireless - rtw_cfg80211_indicate_scan_done(adapter, _TRUE); - - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)) || defined(COMPAT_KERNEL_RELEASE) -- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 2)) -+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 2) || defined(BUILD_OPENWRT)) - if (wdev->links[0].client.current_bss) { - #else - if (wdev->current_bss) { ---- a/os_dep/linux/os_intfs.c -+++ b/os_dep/linux/os_intfs.c -@@ -1584,8 +1584,8 @@ 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)) -- netif_napi_add_weight(ndev, &adapter->napi, rtw_recv_napi_poll, RTL_NAPI_WEIGHT); -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0) || defined(BUILD_OPENWRT)) -+ netif_napi_add(ndev, &adapter->napi, rtw_recv_napi_poll); - #else - netif_napi_add(ndev, &adapter->napi, rtw_recv_napi_poll, RTL_NAPI_WEIGHT); - #endif