From nobody Sat Dec 31 12:39:32 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NkhXN67qQz2nNZY; Sat, 31 Dec 2022 12:39:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NkhXN2xBHz4NP0; Sat, 31 Dec 2022 12:39:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672490372; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5tG65c3LsZGG4uZWh+uttNchG89rnEdsxmSZnZgioUU=; b=U26/5PPBGCTXxfNlMQlGWDgrA49LYBVHCax2ghl0sSgslmc4BJuns/xpy2xW1a0HPoDW5J 4Wd34lZjudQnHCVoj8paj6Efn58ptlJ04pYje6tbrWMStXL+ZodrKQOiApz8q36svifHl7 Of7CiBUnYgFe2Dbw7xelv3jPtTIhSo3dxOTp7pZcffD8i8fp45xQvQBaZs6QhvF4qKPIKt cbd8E/raaqtTVaVzSE+7hOb9SPDcx8j3elBT9KD58BoMG28YDynTKw6WPLCvLPDGS2Lfso z4qk3UwClnWrGvmKoPvpooWBZSpHjMT1KNH6tpIxmDz4LMGcRLpDE9cDO4/csw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672490372; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5tG65c3LsZGG4uZWh+uttNchG89rnEdsxmSZnZgioUU=; b=adY0tdYaIFKq60m/WFctxcO/w0MROKbuhPNBX/SvRJM6MZ60qXXQr9PWeGcO6VMmrAbYHP lnCdUjN5ykZSXby79p1Xts/ZV82OUk6vX+rKiXXhvPRFF8jo3kvY8/4VKX3GEF36hWncyx yxfgGh2orELNIkavvrTzjYJ4UPvmpAe5vqYwQA5yLXKtMJgxWj6SCdsvR/4QiZkBrXRUzH HIFD/Va+f/Qt1GRexoPXn9UzADQuoI3vDpTgO6wZVh8V1HRvOBDj8k3MbQzn7wLOK3rosu h95wwybldIfaRZdW90SsgMDaijquIoisRxZBybp3kyV8bJjcs5B9uASKKHkQRQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672490372; a=rsa-sha256; cv=none; b=bqiXKzoIzCxiX0esMDX+nk7871YFwcZjbzcIPRq8jmLRpdVMmNqldUDTujXWA9PRj3M9A1 Y2hYMbR0i0dLrjZd18cqxt+AuH1wkfJki2tzV8JHlvxI0nU8HWRw1b33w6vTjm9xEt/t1f JrXKZVzsCVPo1+JjkaQezaS5g7N4hZSwTq80r0U1P4LVDpGASu3tCAl9WT/G7BYnFZHh4L TGmCZ2Y2jqqbVlp7Krcx2ad5nT1zvLHSyJrhkG8W6EZ2/HSa/zVzOWCPlHfiG7rWUfabr8 CmB5YrovxvUfgruAMLkAbBsUAkFEeFC0kRQAcoFhMtnj49pn5JmCrMx5gaIlJA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NkhXN1wHpzpSh; Sat, 31 Dec 2022 12:39:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2BVCdWc9084339; Sat, 31 Dec 2022 12:39:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BVCdW5g084338; Sat, 31 Dec 2022 12:39:32 GMT (envelope-from git) Date: Sat, 31 Dec 2022 12:39:32 GMT Message-Id: <202212311239.2BVCdW5g084338@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vincenzo Maffione Subject: git: e93766bcd4e1 - stable/12 - netmap: don't use linux type struct device * List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vmaffione X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: e93766bcd4e18217b9594e827c28c6291d06c6e6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by vmaffione: URL: https://cgit.FreeBSD.org/src/commit/?id=e93766bcd4e18217b9594e827c28c6291d06c6e6 commit e93766bcd4e18217b9594e827c28c6291d06c6e6 Author: Vincenzo Maffione AuthorDate: 2021-04-11 21:06:43 +0000 Commit: Vincenzo Maffione CommitDate: 2022-12-31 12:38:43 +0000 netmap: don't use linux type struct device * Such type cannot be used in code that is in common between FreeBSD and Linux. Use the FreeBSD type instead. MFC after: 3 days Reported by: markj Differential Revision: https://reviews.freebsd.org/D29677 (cherry picked from commit 70275a6735df8a514f48be77418491f2f8dba817) --- sys/dev/netmap/netmap_mem2.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/netmap/netmap_mem2.c b/sys/dev/netmap/netmap_mem2.c index 7d798ee5a7fa..32dd9550418c 100644 --- a/sys/dev/netmap/netmap_mem2.c +++ b/sys/dev/netmap/netmap_mem2.c @@ -308,7 +308,7 @@ netmap_mem_rings_delete(struct netmap_adapter *na) static int netmap_mem_map(struct netmap_obj_pool *, struct netmap_adapter *); static int netmap_mem_unmap(struct netmap_obj_pool *, struct netmap_adapter *); -static int nm_mem_assign_group(struct netmap_mem_d *, struct device *); +static int nm_mem_check_group(struct netmap_mem_d *, bus_dma_tag_t); static void nm_mem_release_id(struct netmap_mem_d *); nm_memid_t @@ -356,7 +356,7 @@ int netmap_mem_finalize(struct netmap_mem_d *nmd, struct netmap_adapter *na) { int lasterr = 0; - if (nm_mem_assign_group(nmd, na->pdev) < 0) { + if (nm_mem_check_group(nmd, na->pdev) < 0) { return ENOMEM; } @@ -725,7 +725,7 @@ netmap_mem_find(nm_memid_t id) } static int -nm_mem_assign_group(struct netmap_mem_d *nmd, struct device *dev) +nm_mem_check_group(struct netmap_mem_d *nmd, bus_dma_tag_t dev) { int err = 0, id; id = nm_iommu_group_id(dev);