From 033d2dcaf9917c35604cc6eca631cb06b1668b27 Mon Sep 17 00:00:00 2001 From: Rihards Skuja Date: Sat, 23 Mar 2024 09:26:57 +0200 Subject: [PATCH] rtl88x2bu-openhd-dkms-git: remove upstreamed patch --- rtl88x2bu-openhd-dkms-git/.SRCINFO | 6 +- ...ange-signature-to-fix-build-on-recen.patch | 79 ------------------- rtl88x2bu-openhd-dkms-git/PKGBUILD | 14 +--- 3 files changed, 6 insertions(+), 93 deletions(-) delete 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 83742df..a649061 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.r222.gaad91d6 - pkgrel = 4 + pkgver = 5.13.1.r224.g4e07c13 + pkgrel = 5 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 = 0001-Update-beacon-change-signature-to-fix-build-on-recen.patch sha256sums = SKIP - sha256sums = 1449a364a7b8bd828420720c21379d6f5fd395dc761b12925b0ba4809bc0ef13 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 deleted file mode 100644 index 62a1ceb..0000000 --- a/rtl88x2bu-openhd-dkms-git/0001-Update-beacon-change-signature-to-fix-build-on-recen.patch +++ /dev/null @@ -1,79 +0,0 @@ -diff --git a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c -index 30b1f66..1c1c3c4 100644 ---- a/os_dep/linux/ioctl_cfg80211.c -+++ b/os_dep/linux/ioctl_cfg80211.c -@@ -5404,14 +5404,25 @@ exit: - } - - static int cfg80211_rtw_change_beacon(struct wiphy *wiphy, struct net_device *ndev, -- struct cfg80211_beacon_data *info) -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 7, 0)) -+ struct cfg80211_ap_update *info -+#else -+ struct cfg80211_beacon_data *info -+#endif -+) - { - int ret = 0; - _adapter *adapter = (_adapter *)rtw_netdev_priv(ndev); -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 7, 0)) -+ struct cfg80211_beacon_data *beacon_info = &info->beacon; -+#else -+ struct cfg80211_beacon_data *beacon_info = info; -+#endif - - 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, beacon_info->head, beacon_info->head_len, -+ beacon_info->tail, beacon_info->tail_len); - - return ret; - } -diff --git a/os_dep/linux/os_intfs.c b/os_dep/linux/os_intfs.c -index 2486c22..0df8591 100644 ---- a/os_dep/linux/os_intfs.c -+++ b/os_dep/linux/os_intfs.c -@@ -2042,13 +2042,13 @@ static void rtw_ethtool_get_drvinfo(struct net_device *dev, struct ethtool_drvin - - wdev = dev->ieee80211_ptr; - if (wdev) { -- strlcpy(info->driver, wiphy_dev(wdev->wiphy)->driver->name, -+ strscpy(info->driver, wiphy_dev(wdev->wiphy)->driver->name, - sizeof(info->driver)); - } else { -- strlcpy(info->driver, "N/A", sizeof(info->driver)); -+ strscpy(info->driver, "N/A", sizeof(info->driver)); - } - -- strlcpy(info->version, DRIVERVERSION, sizeof(info->version)); -+ strscpy(info->version, DRIVERVERSION, sizeof(info->version)); - - padapter = (_adapter *)rtw_netdev_priv(dev); - if (padapter) { -@@ -2059,10 +2059,10 @@ static void rtw_ethtool_get_drvinfo(struct net_device *dev, struct ethtool_drvin - scnprintf(info->fw_version, sizeof(info->fw_version), "%d.%d", - hal_data->firmware_version, hal_data->firmware_sub_version); - } else { -- strlcpy(info->fw_version, "N/A", sizeof(info->fw_version)); -+ strscpy(info->fw_version, "N/A", sizeof(info->fw_version)); - } - -- strlcpy(info->bus_info, dev_name(wiphy_dev(wdev->wiphy)), -+ strscpy(info->bus_info, dev_name(wiphy_dev(wdev->wiphy)), - sizeof(info->bus_info)); - } - -diff --git a/os_dep/linux/usb_intf.c b/os_dep/linux/usb_intf.c -index 1e51e34..5e8b188 100644 ---- a/os_dep/linux/usb_intf.c -+++ b/os_dep/linux/usb_intf.c -@@ -347,7 +347,7 @@ struct rtw_usb_drv usb_drv = { - .usbdrv.reset_resume = rtw_resume, - #endif - --#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 19)) -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 19) && LINUX_VERSION_CODE < KERNEL_VERSION(6, 8, 0)) - .usbdrv.drvwrap.driver.shutdown = rtw_dev_shutdown, - #else - .usbdrv.driver.shutdown = rtw_dev_shutdown, diff --git a/rtl88x2bu-openhd-dkms-git/PKGBUILD b/rtl88x2bu-openhd-dkms-git/PKGBUILD index a9200a5..4e141d0 100644 --- a/rtl88x2bu-openhd-dkms-git/PKGBUILD +++ b/rtl88x2bu-openhd-dkms-git/PKGBUILD @@ -2,29 +2,23 @@ pkgname=rtl88x2bu-openhd-dkms-git _modname=88x2bu_ohd -pkgver=5.13.1.r222.gaad91d6 +pkgver=5.13.1.r224.g4e07c13 _pkgver=5.13.1 -pkgrel=4 +pkgrel=5 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' '0001-Update-beacon-change-signature-to-fix-build-on-recen.patch') -sha256sums=('SKIP' - '1449a364a7b8bd828420720c21379d6f5fd395dc761b12925b0ba4809bc0ef13') +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/0001-Update-beacon-change-signature-to-fix-build-on-recen.patch" -} - package() { cd "${srcdir}/rtl88x2bu" mkdir -p "${pkgdir}/usr/src/${_modname}-${pkgver}"