From 4cd3f26b53a7e5f4716c14e01460c04d4da3977e Mon Sep 17 00:00:00 2001
From: Ivan Belokobylskiy <belokobylskij@gmail.com>
Date: Tue, 19 Nov 2024 10:22:28 +0300
Subject: [PATCH] fix 8723

---
 package/kernel/rtl8723bs-ol/Makefile          |  8 ++---
 .../patches/001-use-kernel-byteorder.patch    | 14 ++++-----
 .../002-fix-build-on-linux-6.7-kernel.patch   | 29 +++++++++++++++++++
 3 files changed, 40 insertions(+), 11 deletions(-)
 create mode 100644 package/kernel/rtl8723bs-ol/patches/002-fix-build-on-linux-6.7-kernel.patch

diff --git a/package/kernel/rtl8723bs-ol/Makefile b/package/kernel/rtl8723bs-ol/Makefile
index af6c059cc8f93e..2e99601c300f88 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/rtl8822bs-aml.git
-PKG_MIRROR_HASH:=skip
+PKG_SOURCE_URL:=https://github.com/openlumi/rtl8723bs.git
+PKG_MIRROR_HASH:=ea8c042faf5488f1b1cd0df774a44f62cad5e677d573f464596bf2a9d1fc2567
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_DATE:=2023-05-08
-PKG_SOURCE_VERSION:=4754406f9304959fc0dd1602be1c74eb940bd3c0
+PKG_SOURCE_DATE:=2023-06-13
+PKG_SOURCE_VERSION:=04a0bd2edd1ca95b30f8ff47f59624e1277fadf1
 
 PKG_MAINTAINER:=Ivan Belokobylskiy <belokobylskij@gmail.com>
 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 <drv_conf.h>
+ #include <basic_types.h>
+ #include <osdep_service.h>
+-#include <rtw_byteorder.h>
 +#include <asm/byteorder.h>
- #include "wlan_bssdef.h"
- #include "wifi.h"
- #include "ieee80211.h"
+ #include <wlan_bssdef.h>
+ #include <wifi.h>
+ #include <ieee80211.h>
diff --git a/package/kernel/rtl8723bs-ol/patches/002-fix-build-on-linux-6.7-kernel.patch b/package/kernel/rtl8723bs-ol/patches/002-fix-build-on-linux-6.7-kernel.patch
new file mode 100644
index 00000000000000..3382e9b942a350
--- /dev/null
+++ b/package/kernel/rtl8723bs-ol/patches/002-fix-build-on-linux-6.7-kernel.patch
@@ -0,0 +1,29 @@
+--- a/os_dep/linux/ioctl_cfg80211.c
++++ b/os_dep/linux/ioctl_cfg80211.c
+@@ -4020,6 +4020,18 @@ static int cfg80211_rtw_start_ap(struct
+ 	return ret;
+ }
+ 
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6,7,0))|| defined(BUILD_OPENWRT)
++static int cfg80211_rtw_change_beacon(struct wiphy *wiphy, struct net_device *ndev,
++				      struct cfg80211_ap_update *info)
++{
++	int ret = 0;
++	_adapter *adapter = (_adapter *)rtw_netdev_priv(ndev);
++
++	RTW_INFO(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
++
++	ret = rtw_add_beacon(adapter, info->beacon.head, info->beacon.head_len,
++			     info->beacon.tail, info->beacon.tail_len);
++#else
+ static int cfg80211_rtw_change_beacon(struct wiphy *wiphy, struct net_device *ndev,
+                                       struct cfg80211_beacon_data *info)
+ {
+@@ -4029,6 +4041,7 @@ static int cfg80211_rtw_change_beacon(st
+ 	RTW_INFO(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
+ 
+ 	ret = rtw_add_beacon(adapter, info->head, info->head_len, info->tail, info->tail_len);
++#endif
+ 
+ 	return ret;
+ }