From nobody Wed Jun 24 19:51:07 2026 X-Original-To: dev-commits-src-main@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 4glsxl5PD7z6jjwB for ; Wed, 24 Jun 2026 19:51:07 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4glsxl4g6Cz3sbQ for ; Wed, 24 Jun 2026 19:51:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782330667; 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=XIoridyJWozMhV5kUSuIk1lD4rW+g+ok7rSYXXG6z/g=; b=ZTocbig4rRcttInafv3LOL6BzbzONyofN16LaeubjLkWH/5+fddrY2fPhrjr5v/HmGXMTY HOPsU73wqAI7T3o/ChYRUh1S/9YRgLs2/h3RxhQavoYiL1mnS1h4Vg3bmC9wxQLmLK9g5z n970PLrEt7r5hBYN/1yZbYENwwTt5YAKN3IjuG8g3h9l/Wey3AkeHQddxCvCcnYfKP+TtF /99ZCFNkx4ENqB4zOoA3FxE83lHPcKKGttCUuNSdm0hPtTg63vHef3/KPgBJO3hKAwfVty ENa+gdDpPPq1pKmK2MaRu1jo6XUPNV6yJFqRXcNbPetw6OMz1iGaZryfa3TDqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782330667; a=rsa-sha256; cv=none; b=o0NrFUEVHljYstYzYn6RCZ3FmO7lK+9aDsYDuwgiv2w4ImdZcS03Fdl9QTQq3foMXL2Sy1 bb5ZQCg6z1auAU0dlHabTKXpdqYSGy+92qra5zrb0xZjz41niJ6Js64xv4BAqTW8GcWwBE LEK7tbWyaQkEr9DxSQGOhlQwIjZkIhYtI1dsmqPDvEqQGNZ3BTiOR/wEt0PNeNhmb48kEE aZOQsET+UPFv20a8FOXQeKvtl+gSWWEiZsonjmzqHetYf8wDwgNTbmE0UTuYyTFZXJDbyW IpSLHheppzxNS3OHyHf6nBBK8XlOj7IvS1Ku0oKm2ozD8MoebWjdOUnMSHnY2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782330667; 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=XIoridyJWozMhV5kUSuIk1lD4rW+g+ok7rSYXXG6z/g=; b=y2eRdgRjKY0sjuWnHcc4Q7QzjFvjp+KRoeAz+I2Eub9i0sOBk3+RMsgP2BdDYWlUAF2MAQ iePZkrSp/3kfbEDhdPLllRBEeg5n+dpfFPAN1fq5L8Nco9+R48gF8LA7dpUyFjHeWbx828 aCGVNyisg377oBCKmTNLmLfQEHRYWpej0q+e3VcQwwG3aOoYBpdIGIk1sXqsEA5XEL5914 FMjxvNdgFtdEpFlJrgtiRlkFh8fGofFt1Kxfnvz7wespEIb2rgQHJQw/PSYfFSELQQvYcI csrmSA059NzAtgErud1XeUqUMtj+3uG8+i+O6V7Mmh7lXYVT8gPwcjw3imN7wg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4glsxl3Zn1zZgZ for ; Wed, 24 Jun 2026 19:51:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4267a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 24 Jun 2026 19:51:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: eaf9f1aafa82 - main - OFED: Use _ib_modify_qp to implement ib_modify_qp List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eaf9f1aafa82b110a38fe3cb7cf4fa8b820e5bf4 Auto-Submitted: auto-generated Date: Wed, 24 Jun 2026 19:51:07 +0000 Message-Id: <6a3c352b.4267a.76c251cb@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=eaf9f1aafa82b110a38fe3cb7cf4fa8b820e5bf4 commit eaf9f1aafa82b110a38fe3cb7cf4fa8b820e5bf4 Author: John Baldwin AuthorDate: 2026-06-24 19:30:55 +0000 Commit: John Baldwin CommitDate: 2026-06-24 19:30:55 +0000 OFED: Use _ib_modify_qp to implement ib_modify_qp This was missed when merging in ib_modify_qp_with_udata() previously. Tested by: Wafa Hamzah (mlx5_ib) Tested by: John Baldwin (iw_cxgbe) Fixes: b633e08c705f ("ibcore: Kernel space update based on Linux 5.7-rc1.") Sponsored by: Chelsio Communications --- sys/ofed/drivers/infiniband/core/ib_verbs.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/sys/ofed/drivers/infiniband/core/ib_verbs.c b/sys/ofed/drivers/infiniband/core/ib_verbs.c index bab55dbe6a71..9ae6854bab92 100644 --- a/sys/ofed/drivers/infiniband/core/ib_verbs.c +++ b/sys/ofed/drivers/infiniband/core/ib_verbs.c @@ -1412,15 +1412,7 @@ int ib_modify_qp(struct ib_qp *qp, struct ib_qp_attr *qp_attr, int qp_attr_mask) { - if (qp_attr_mask & IB_QP_AV) { - int ret; - - ret = ib_resolve_eth_dmac(qp->device, &qp_attr->ah_attr); - if (ret) - return ret; - } - - return qp->device->modify_qp(qp->real_qp, qp_attr, qp_attr_mask, NULL); + return _ib_modify_qp(qp->real_qp, qp_attr, qp_attr_mask, NULL); } EXPORT_SYMBOL(ib_modify_qp);