From eba2c333bf4adc86c5d29dd0917867f42683f7bc Mon Sep 17 00:00:00 2001 From: Rihards Skuja Date: Thu, 29 Feb 2024 12:32:09 +0200 Subject: [PATCH] rtl88x2bu-openhd-dkms-git: fix build on recent kernels --- rtl88x2bu-openhd-dkms-git/.SRCINFO | 6 +++-- ...ange-signature-to-fix-build-on-recen.patch | 26 +++++++++++++++++++ rtl88x2bu-openhd-dkms-git/PKGBUILD | 14 +++++++--- 3 files changed, 40 insertions(+), 6 deletions(-) create mode 100644 rtl88x2bu-openhd-dkms-git/0001-Update-beacon-change-signature-to-fix-build-on-recen.patch diff --git a/rtl88x2bu-openhd-dkms-git/.SRCINFO b/rtl88x2bu-openhd-dkms-git/.SRCINFO index 2b7a9d3..9d1f4bc 100644 --- a/rtl88x2bu-openhd-dkms-git/.SRCINFO +++ b/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.r214.g7a54b83 - pkgrel = 2 + pkgver = 5.13.1.r222.gaad91d6 + pkgrel = 3 url = https://github.com/OpenHD/rtl88x2bu arch = any license = GPL2 @@ -9,6 +9,8 @@ pkgbase = rtl88x2bu-openhd-dkms-git depends = dkms depends = bc source = git+https://github.com/OpenHD/rtl88x2bu.git + source = 0001-Update-beacon-change-signature-to-fix-build-on-recen.patch sha256sums = SKIP + sha256sums = 09b1eb02d46e4bd59f19bd5d9f7da3d2ddb8e9a4f2468123640d703a406d28f5 pkgname = rtl88x2bu-openhd-dkms-git diff --git a/rtl88x2bu-openhd-dkms-git/0001-Update-beacon-change-signature-to-fix-build-on-recen.patch b/rtl88x2bu-openhd-dkms-git/0001-Update-beacon-change-signature-to-fix-build-on-recen.patch new file mode 100644 index 0000000..18a3d06 --- /dev/null +++ b/rtl88x2bu-openhd-dkms-git/0001-Update-beacon-change-signature-to-fix-build-on-recen.patch @@ -0,0 +1,26 @@ +From 92a45250525b46fb5230e19c1d02ad5e924b8071 Mon Sep 17 00:00:00 2001 +From: Rihards Skuja +Date: Thu, 29 Feb 2024 12:29:21 +0200 +Subject: [PATCH] Update beacon change signature to fix build on recent kernels + +--- + os_dep/linux/ioctl_cfg80211.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c +index 30b1f66..d8fa7ce 100644 +--- a/os_dep/linux/ioctl_cfg80211.c ++++ b/os_dep/linux/ioctl_cfg80211.c +@@ -5411,7 +5411,8 @@ static int cfg80211_rtw_change_beacon(struct wiphy *wiphy, struct net_device *nd + + 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); ++ ret = rtw_add_beacon(adapter, info->beacon.head, info->beacon.head_len, ++ info->beacon.tail, info->beacon.tail_len); + + return ret; + } +-- +2.44.0 + diff --git a/rtl88x2bu-openhd-dkms-git/PKGBUILD b/rtl88x2bu-openhd-dkms-git/PKGBUILD index 8aace4b..853cb8a 100644 --- a/rtl88x2bu-openhd-dkms-git/PKGBUILD +++ b/rtl88x2bu-openhd-dkms-git/PKGBUILD @@ -2,23 +2,29 @@ pkgname=rtl88x2bu-openhd-dkms-git _modname=88x2bu_ohd -pkgver=5.13.1.r214.g7a54b83 +pkgver=5.13.1.r222.gaad91d6 _pkgver=5.13.1 -pkgrel=2 +pkgrel=3 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') -sha256sums=('SKIP') +source=('git+https://github.com/OpenHD/rtl88x2bu.git' '0001-Update-beacon-change-signature-to-fix-build-on-recen.patch') +sha256sums=('SKIP' + '09b1eb02d46e4bd59f19bd5d9f7da3d2ddb8e9a4f2468123640d703a406d28f5') 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/0001-Update-beacon-change-signature-to-fix-build-on-recen.patch" +} + package() { cd "${srcdir}/rtl88x2bu" mkdir -p "${pkgdir}/usr/src/${_modname}-${pkgver}"