From: Julius Bairaktaris Date: Thu, 2 Jul 2026 08:15:30 +0000 (+0200) Subject: mac80211: drop the ath iommu_paging_domain revert X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c752530abf2f3ed6f8bd672f0e78447ca6f07fc7;p=thirdparty%2Fopenwrt.git mac80211: drop the ath iommu_paging_domain revert The patch reverted ath10k/ath11k to iommu_domain_alloc(), which kernel 6.18 removed; iommu_paging_domain_alloc() exists on every kernel this tree builds. Unnoticed upstream because no 6.18 target builds ath11k-ahb. Signed-off-by: Julius Bairaktaris Link: https://github.com/openwrt/openwrt/pull/24031 Signed-off-by: Jonas Jelonek --- diff --git a/package/kernel/mac80211/patches/build/150-ath_iommu_paging_domain_revert.patch b/package/kernel/mac80211/patches/build/150-ath_iommu_paging_domain_revert.patch deleted file mode 100644 index f020af7c239..00000000000 --- a/package/kernel/mac80211/patches/build/150-ath_iommu_paging_domain_revert.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- a/drivers/net/wireless/ath/ath10k/snoc.c -+++ b/drivers/net/wireless/ath/ath10k/snoc.c -@@ -1630,10 +1630,10 @@ static int ath10k_fw_init(struct ath10k - - ar_snoc->fw.dev = &pdev->dev; - -- iommu_dom = iommu_paging_domain_alloc(ar_snoc->fw.dev); -- if (IS_ERR(iommu_dom)) { -+ iommu_dom = iommu_domain_alloc(&platform_bus_type); -+ if (!iommu_dom) { - ath10k_err(ar, "failed to allocate iommu domain\n"); -- ret = PTR_ERR(iommu_dom); -+ ret = -ENOMEM; - goto err_unregister; - } - ---- a/drivers/net/wireless/ath/ath11k/ahb.c -+++ b/drivers/net/wireless/ath/ath11k/ahb.c -@@ -1020,10 +1020,10 @@ static int ath11k_ahb_fw_resources_init( - - ab_ahb->fw.dev = &pdev->dev; - -- iommu_dom = iommu_paging_domain_alloc(ab_ahb->fw.dev); -- if (IS_ERR(iommu_dom)) { -+ iommu_dom = iommu_domain_alloc(&platform_bus_type); -+ if (!iommu_dom) { - ath11k_err(ab, "failed to allocate iommu domain\n"); -- ret = PTR_ERR(iommu_dom); -+ ret = -ENOMEM; - goto err_unregister; - } -