From nobody Mon Aug 29 12:08:54 2022 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 4MGTkG6BlRz4b0jC; Mon, 29 Aug 2022 12:08:54 +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 4MGTkG5ltVz437S; Mon, 29 Aug 2022 12:08:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661774934; 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=gET/p3GgS3Y7L7H4TYgFuKIV3YQWZTten5zS25TI76Y=; b=xVJmvwz3yiRK8G6PmVqBFuHnSOkU19MFFDiKWfAnuXSv8lHCf/DbixO2hPHF8dNz3zy1sk eu4G+iqN61aBNAf00Qk1TsrzzoTUCNLrwNR9ZwboyaG1t/nxjClzXGw/9yWM3c5PT9Oh6/ +O4alb3Kv1MfHVXyaJqC5yXgXPqiDJcFjy5cZlsDd3MNqY+LfDa8D0KGonWX0H2+xItjcE GAAQTXlJLNBO6eaXL8B1YlqDa8grDI7qltvaMUyPxkc+8GWK4TDMfJ9SX4yS7qWYUNXJVl 0Mznxg9OUofowijf0mLsqD0W0TV5KIZi9S2Tb1lTRkEzF6v+qyaEqXevPJoFFg== 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 4MGTkG4sxwzQSs; Mon, 29 Aug 2022 12:08:54 +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 27TC8sCN039514; Mon, 29 Aug 2022 12:08:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27TC8sjS039513; Mon, 29 Aug 2022 12:08:54 GMT (envelope-from git) Date: Mon, 29 Aug 2022 12:08:54 GMT Message-Id: <202208291208.27TC8sjS039513@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Hans Petter Selasky Subject: git: 4149598b7a92 - stable/12 - ibcore: Add support for RDMA/RoCE using VLAN(4) devices. 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: hselasky X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 4149598b7a9296d0efbbc52b758d8d2d52b12e48 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661774934; 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=gET/p3GgS3Y7L7H4TYgFuKIV3YQWZTten5zS25TI76Y=; b=EwD9JccSLovb7jUnsazObxZmWPlZWB1w+R5eFg12kCHO5gSzrNDa3mQ7dSNXd5yphrlTx1 ihUivHu4OUlipR60ajGNkICC6/tk6JomvM3XgY0Wmw4uvNRKlM0p+O0jvTcAAKWpmL9voP 4Mu0tdJsRZcLgtiPzF6X+0hIXQraz2c2VaTSD2M9fKu8Bj3RjjOtM/d2VBhdwOpTxc+Vyi KrTCkVFC1ZLzZU4/iKk6dkKh6tk6dgM4/7YbyT8/uRMy0GyovYeh+kB2R9giw//9Qlu/5H KJB3UNMUTyV+ZWyHdC4pdjFmB5Ni6NkXxs2iYhpHq7DfOdy7geObtVk7kieFdQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661774934; a=rsa-sha256; cv=none; b=KrGooRAv0d56Ethv4Ey5TBBN2riFlw9C6Faxw7qvy5KEMB4P8fmhT8yZ89sUtsH5AFUPYt Rmdeu6r0sWoZYmQlLweb73fUv3me3jpm4ozAgkS3nrix4t6SW5xcWCk0JAyeDzBxea5GBQ OwWfsJ5FaKN0Xvlq2ns52ZUyR5Nc63QASFc30V9U1Ae+UBhk/xwDksEUwoUTlx7aA4JLzo mVEEisB5fonju1ve9sKcLdlQq66cA2bd8uduKU7SXjtN6ZJevP8tuk2Ch4+/6lmUwNTbut 8JF8LStuq3tzQ5gsTr1HUjr1JXNsB1Bg1ZDZ4l+VBO1dB+A+5ftV9FKclpEeLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by hselasky: URL: https://cgit.FreeBSD.org/src/commit/?id=4149598b7a9296d0efbbc52b758d8d2d52b12e48 commit 4149598b7a9296d0efbbc52b758d8d2d52b12e48 Author: Hans Petter Selasky AuthorDate: 2022-08-22 08:03:24 +0000 Commit: Hans Petter Selasky CommitDate: 2022-08-29 12:06:38 +0000 ibcore: Add support for RDMA/RoCE using VLAN(4) devices. Classify VLAN devices as ethernet in rdma_copy_addr(). This fixes the following error message: rdma_bind_addr: No such file or directory Submitted by: Piotr Kubaj Differential Revision: https://reviews.freebsd.org/D36120 Sponsored by: NVIDIA Networking (cherry picked from commit 57af517ac4e8f88339ad1ff778d3b7ac32827430) --- sys/ofed/drivers/infiniband/core/ib_addr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/ofed/drivers/infiniband/core/ib_addr.c b/sys/ofed/drivers/infiniband/core/ib_addr.c index a56219ae48a0..787ff7c0a00c 100644 --- a/sys/ofed/drivers/infiniband/core/ib_addr.c +++ b/sys/ofed/drivers/infiniband/core/ib_addr.c @@ -150,7 +150,7 @@ int rdma_copy_addr(struct rdma_dev_addr *dev_addr, struct net_device *dev, return (0); } else if (dev->if_type == IFT_INFINIBAND) dev_addr->dev_type = ARPHRD_INFINIBAND; - else if (dev->if_type == IFT_ETHER) + else if (dev->if_type == IFT_ETHER || dev->if_type == IFT_L2VLAN) dev_addr->dev_type = ARPHRD_ETHER; else dev_addr->dev_type = 0;