From nobody Mon Aug 14 15:53:51 2023 X-Original-To: dev-commits-src-all@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 4RPf8H6FGQz4qgQH; Mon, 14 Aug 2023 15:53:51 +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 4RPf8H5Q7qz3VKV; Mon, 14 Aug 2023 15:53:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692028431; 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=p9QPryqCZDun89WVP7UscEcng2LzLYsZ1rM1Biwj6EA=; b=hBwHdLJHPDYFiQp9/pca5rbo9mu+1Y1+o1sy0kKpuHz0T1faIcfC7KQtpL0XT/wDC9+75j Fp+IG8KJXJhQgkvfWOSwyyzWtqg/k1R+1h7ozK6F/Vxd5dhPBUwDHrMuwQT17yE35q6D/f maGqGMRO+atloPpCWg4Obf5u1WU295d/Mg7VGalrBPzVUDkaV0GZ8U0nF4YO2EZsxsSs6V yui13iMcddF6DFT4UgoHeMdbHzvVqTD47uKOhQAwbbsSjJDzQ4TgigNG+wdX+Yew5JfHpm lO8h5VJ1kbH/tT591AWTFWVxpouAhlLJAjB/9+GKpBzklf6v5z3o6r+p3PJn+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692028431; 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=p9QPryqCZDun89WVP7UscEcng2LzLYsZ1rM1Biwj6EA=; b=mcnBP/X690wEqjUX6u5T+AfeODAyW3PQWpw7X8l3Mp/sYvwI3on13t0AFpu1zUrmYyaFPk lTqIWy4vOEwcKwodXF5YMgzGVxvf1U3KMWi+X5roRMsEZgCcymR4Wf4mP7VkZ9S5v/T2ZU iZFrxciBvFgM++gwb0OHDiTZC+z5Uzo3MTbORiIHeMO0/e+P0AMuozJqxknCaFY3bQsVXg SIreOAxdnHOLSwQwFMK94ukGUrj4HK33zRuk06W155c9ezkfe8CnbmOBabe429bOc0sXb7 wFgVxhMe9g1zM4OBcacDmiEILtlNVHcKwREppFWa0RspekQWtrqGqDF9PsRdwQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692028431; a=rsa-sha256; cv=none; b=blpFTacNWL9MOEFgs0yMeb2B4RyzgzoHT6JdUikLShWv+uQrJiFPQT2QUU4DVsxVm68Wip r90JJCllAlMNJre3xHxHcrRf+U/3mFswDFhbJR63HChrLjBp1qPgIERb6pb6dVPEBqrWXh +SpUnSjWFDnq79w/VK13HvyztII2qs8PcetR2t5nU44Gis9XnmL3YyK9uWhTy7r6aHUpqG UQDGRdna/4TDzjfUytZeHQ43IQE4GXRgVPFSjc9NEB0nebkR2owzrOMpzyCTmH+kn1jJxQ Ljr71UNSW7MbVU+ui7EYfnqfxcaxFPBD9f3JA3KLMq2Zvl2vhdTeUn9saczE8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RPf8H4SbyzYwk; Mon, 14 Aug 2023 15:53:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37EFrpem060105; Mon, 14 Aug 2023 15:53:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37EFrpOU060103; Mon, 14 Aug 2023 15:53:51 GMT (envelope-from git) Date: Mon, 14 Aug 2023 15:53:51 GMT Message-Id: <202308141553.37EFrpOU060103@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Eric Joyner Subject: git: 8e6654a6a551 - main - ofed: fix roce gid insertion for vlan interfaces List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: erj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8e6654a6a5511da87de03a91c527e1d7ad006c21 Auto-Submitted: auto-generated The branch main has been updated by erj: URL: https://cgit.FreeBSD.org/src/commit/?id=8e6654a6a5511da87de03a91c527e1d7ad006c21 commit 8e6654a6a5511da87de03a91c527e1d7ad006c21 Author: Bartosz Sobczak AuthorDate: 2023-08-14 15:49:26 +0000 Commit: Eric Joyner CommitDate: 2023-08-14 15:53:43 +0000 ofed: fix roce gid insertion for vlan interfaces When attempting to use vlan interface the correct GID wasn't created due to incorrect ifp validation. The problem was introduced in 3e142e07675b ('ofed: Mechanically convert to IfAPI) Signed-off-by: Bartosz Sobczak bartosz.sobczak@intel.com Signed-off-by: Eric Joyner PR: 273043 Sponsored by: Intel Corporation Reviewed by: jhibbits@, erj@ MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D41426 --- sys/ofed/drivers/infiniband/core/ib_roce_gid_mgmt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/ofed/drivers/infiniband/core/ib_roce_gid_mgmt.c b/sys/ofed/drivers/infiniband/core/ib_roce_gid_mgmt.c index 1396a4aacf3a..0acb16935986 100644 --- a/sys/ofed/drivers/infiniband/core/ib_roce_gid_mgmt.c +++ b/sys/ofed/drivers/infiniband/core/ib_roce_gid_mgmt.c @@ -239,7 +239,7 @@ roce_gid_update_addr_callback(struct ib_device *device, u8 port, if (ifp != ndev) { if (if_gettype(ifp) != IFT_L2VLAN) continue; - if (ifp != rdma_vlan_dev_real_dev(ifp)) + if (ndev != rdma_vlan_dev_real_dev(ifp)) continue; }