rtl88x2bu-openhd-dkms-git: remove upstreamed patch

openhd-git/.SRCINFO

@@ -1,7 +1,7 @@
 pkgbase = openhd-git
 	pkgdesc = Open-source digital FPV system
-	pkgver = 2.6.0.r1.gd19b2c9
-	pkgrel = 1
+	pkgver = 2.6.0.r9.g6360d3f
+	pkgrel = 2
 	url = https://openhdfpv.org
 	arch = any
 	license = GPL3

openhd-git/PKGBUILD

@@ -2,8 +2,8 @@
 
 pkgname=openhd-git
 _reponame=OpenHD
-pkgver=2.6.0.r1.gd19b2c9
-pkgrel=1
+pkgver=2.6.0.r9.g6360d3f
+pkgrel=2
 pkgdesc='Open-source digital FPV system'
 arch=(any)
 url='https://openhdfpv.org'
@@ -24,6 +24,11 @@ pkgver() {
 	git describe --long --tags --abbrev=7 | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
+prepare() {
+	cd "$_reponame"
+	git submodule update --init --recursive
+}
+
 build() {
 	cmake -B build -S "$_reponame/OpenHD" -DCMAKE_INSTALL_PREFIX=/usr -Wno-dev
 	cmake --build build

rtl88x2bu-openhd-dkms-git/.SRCINFO

@@ -1,7 +1,7 @@
 pkgbase = rtl88x2bu-openhd-dkms-git
 	pkgdesc = Realtek RTL88x2BU WiFi USB driver (with OpenHD patches)
-	pkgver = 5.13.1.r227.g9571cc7
-	pkgrel = 6
+	pkgver = 5.13.1.r229.g0f4686b
+	pkgrel = 7
 	url = https://github.com/OpenHD/rtl88x2bu
 	arch = any
 	license = GPL2
@@ -9,8 +9,6 @@ pkgbase = rtl88x2bu-openhd-dkms-git
 	depends = dkms
 	depends = bc
 	source = git+https://github.com/OpenHD/rtl88x2bu.git
-	source = fix-6.9.0-build.patch
 	sha256sums = SKIP
-	sha256sums = fd6afeadc4b00b74d9ed870fe446ffcc0773d07364fb7ed07f538b0ca07507ed
 
 pkgname = rtl88x2bu-openhd-dkms-git

rtl88x2bu-openhd-dkms-git/PKGBUILD

@@ -2,28 +2,23 @@
 
 pkgname=rtl88x2bu-openhd-dkms-git
 _modname=88x2bu_ohd
-pkgver=5.13.1.r227.g9571cc7
+pkgver=5.13.1.r229.g0f4686b
 _pkgver=5.13.1
-pkgrel=6
+pkgrel=7
 pkgdesc='Realtek RTL88x2BU WiFi USB driver (with OpenHD patches)'
 arch=(any)
 url='https://github.com/OpenHD/rtl88x2bu'
 license=(GPL2)
 depends=(dkms bc)
 makedepends=(git)
-source=('git+https://github.com/OpenHD/rtl88x2bu.git' 'fix-6.9.0-build.patch')
-sha256sums=('SKIP' 'fd6afeadc4b00b74d9ed870fe446ffcc0773d07364fb7ed07f538b0ca07507ed')
+source=('git+https://github.com/OpenHD/rtl88x2bu.git')
+sha256sums=('SKIP')
 
 pkgver() {
 	cd "${srcdir}/rtl88x2bu"
 	printf '%s.r%s.g%s' "${_pkgver}" "$(git rev-list --count HEAD)" "$(git rev-parse --short=7 HEAD)"
 }
 
-prepare() {
-	cd "${srcdir}/rtl88x2bu"
-	patch -p1 -i "$srcdir/fix-6.9.0-build.patch"
-}
-
 package() {
 	cd "${srcdir}/rtl88x2bu"
 	mkdir -p "${pkgdir}/usr/src/${_modname}-${pkgver}"

rtl88x2bu-openhd-dkms-git/fix-6.9.0-build.patch

@@ -1,26 +0,0 @@
-diff --git a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c
-index 1c1c3c4..76d71f4 100644
---- a/os_dep/linux/ioctl_cfg80211.c
-+++ b/os_dep/linux/ioctl_cfg80211.c
-@@ -454,7 +454,9 @@ u8 rtw_cfg80211_ch_switch_notify(_adapter *adapter, u8 ch, u8 bw, u8 offset,
- 
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0))
- 	if (started) {
--#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0))
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 9, 0))
-+	cfg80211_ch_switch_notify(adapter->pnetdev, &chdef, 0);
-+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0))
- 	cfg80211_ch_switch_notify(adapter->pnetdev, &chdef, 0, 0);
- #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0))
- 		cfg80211_ch_switch_started_notify(adapter->pnetdev, &chdef, 0, 0, false);
-@@ -479,7 +481,9 @@ u8 rtw_cfg80211_ch_switch_notify(_adapter *adapter, u8 ch, u8 bw, u8 offset,
- 	if (!rtw_cfg80211_allow_ch_switch_notify(adapter))
- 		goto exit;
- 
--#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0))
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 9, 0))
-+	cfg80211_ch_switch_notify(adapter->pnetdev, &chdef, 0);
-+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0))
- 	cfg80211_ch_switch_notify(adapter->pnetdev, &chdef, 0, 0);
- #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 2))
- 	cfg80211_ch_switch_notify(adapter->pnetdev, &chdef, 0);