From nobody Wed Apr 19 15:53:07 2023 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 4Q1lgS0clMz467fh; Wed, 19 Apr 2023 15:53:08 +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 4Q1lgR5LGkz3t3X; Wed, 19 Apr 2023 15:53:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681919587; 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=0CHeLhpgwfq+MXVqecMkf1RuZ0M47L7kbg1DFG6mvSM=; b=EP7nUjtSyfFHtNWrUxe+RZcHqc84Nra1vwRTPGr+FKDYEI5u5kysGS0Kr/+G7gW2NFzK9H pI6QAglPv5ZkM0080zURKv9MktQh8WFTS+uZfc0ULBdu1N0DtyeBBDTYq+4GZXLx8EwHXL sE4wFMZa8jORdO1Cx7twJ0kgYKfRjshZ/YReckX29b7rEEVkmaZPaNKLivNG5iNwYDpEC3 R+NDNWYDGgQ8WoIhCxA9ZDMeIv/TsZl26dCz7VdU5Si+tyVnfVQy6xpUd8B1OQWufO8yk3 EWX2d0TEurv6UrT5zIBJEQ14CyaRjP/soA1cOiCdCMDxjttTyGqQKP42ZCKVNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681919587; 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=0CHeLhpgwfq+MXVqecMkf1RuZ0M47L7kbg1DFG6mvSM=; b=uqSO8LYV2ncowHuyidLZycT0a1C5KNdJ/RyW+l09mpf7czwxPSwklmpsHGZa5aXOXi0hM6 LPH/AtAfuSjfodJIJv9/r+Y+0skSad+MEv6Puy2Dtx/ktrzHAEaM++RvN3qBp7H2dD2aq5 TQUm37OP488UmH4KxbA3sK4vOmMY1Vcf6Sta7yFOPRDPMa3pup3rHQK8Snua8NTJny8Ezc jDUnv2A67sDDLObHnlNEVncJoALu4kGQETtcI+t5Gd/3nUqZ7/HyJuVlAIW0VEqiZYt3YO 9wU/zToqCjvyB9gCCQgiTmIR/Y7xBOMh/zcuXacePhWZjHZ/SEQQopydC4+0Bg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681919587; a=rsa-sha256; cv=none; b=a6r0F5KUOowbCNVGORM3tof9EZvfPejBtXL00GfKlHpWmj1dtobXk2DjsFcnhgBmmWkQG8 JW6i6tFwx9tJ3oUzWoCxGHTujo6yRxTVJx62wLP5BmsORpp/HkS/UqCk5ADUxd0MjMy4wE Kt+KUr9oPhEUo1rhn8vzYiSyivKheHGOuTdaapJ0SRnWB5Pcrj0YU2rrihmYrk8NEgWhdb tEqCQ//Qae9O6mTpux2fclF25DXE8X5t0XLLusHZ0W26bNtE70J7FCQADCbuBoN4UP5vMb 51Wl6LVz3mXtm2VJor3bcl/cFnVnlD1CsGCnxSngWpG03WiEqxxmHhK8JITgrg== 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 4Q1lgR4LTpz11VB; Wed, 19 Apr 2023 15:53:07 +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 33JFr7u0040151; Wed, 19 Apr 2023 15:53:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33JFr7mp040150; Wed, 19 Apr 2023 15:53:07 GMT (envelope-from git) Date: Wed, 19 Apr 2023 15:53:07 GMT Message-Id: <202304191553.33JFr7mp040150@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: 12e99b63d2fa - main - ofed: Fix a logic inversion from IfAPI conversion 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 12e99b63d2fae07fc54e53d9187a3995a2005ec9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=12e99b63d2fae07fc54e53d9187a3995a2005ec9 commit 12e99b63d2fae07fc54e53d9187a3995a2005ec9 Author: Justin Hibbits AuthorDate: 2023-04-19 15:21:32 +0000 Commit: Justin Hibbits CommitDate: 2023-04-19 15:56:25 +0000 ofed: Fix a logic inversion from IfAPI conversion Reported by: bartosz.sobczak_intel.com Fixes: 3e142e07675b ("ofed: Mechanically convert to IfAPI") Sponsored by: Juniper Networks, Inc. --- sys/ofed/include/rdma/ib_addr.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/ofed/include/rdma/ib_addr.h b/sys/ofed/include/rdma/ib_addr.h index d7930eff66f1..2af055ea8950 100644 --- a/sys/ofed/include/rdma/ib_addr.h +++ b/sys/ofed/include/rdma/ib_addr.h @@ -180,7 +180,7 @@ static inline u16 rdma_vlan_dev_vlan_id(if_t dev) { uint16_t tag; - if (if_gettype(dev) != IFT_ETHER || if_getpcp(dev) == IFNET_PCP_NONE) + if (if_gettype(dev) == IFT_ETHER && if_getpcp(dev) != IFNET_PCP_NONE) return 0x0000; /* prio-tagged traffic */ if (VLAN_TAG(__DECONST(if_t, dev), &tag) != 0) return 0xffff;