From nobody Tue May 21 03:27:35 2024 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 4Vk0HW3SDjz5L27d; Tue, 21 May 2024 03:27:35 +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 4Vk0HW2q6fz42ld; Tue, 21 May 2024 03:27:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716262055; 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=zyL/hUjtaXJkh8hS5yx9JaH2t/Mb2jelejCjm3IpXIM=; b=PGT98XVjbZ4/4AGAiLx6U9fDxwdAt4dGGB8VZoxxNetBi1pUbl8NmnhCXmqjO9wbmfuZUS h+SX90nCC/oVb//Dh2y1zYRLSkeTIf0jjcGOpEEhc1UBEp8Qyz7Q4A6vWAAwLfxwIQXerh tVJqKcLyXYKZ/BLdDpFdQ7hV+Y11jCJUHro91G6LjeazXg93NkZvTIpLSakB6G0SzQH1L6 pGURCV3cDTnCrvsvKBINoH0CvL/NHfW8Bw8spYe4S2+gV+P+wbDCXFh52vnELEZxDEH5/G J9dO/97Ng62rvMYSsSUeZt/utDYpDmTCVbLK6h/ncRqYj76G0tyJJ34A4hOysg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716262055; a=rsa-sha256; cv=none; b=bhrsElrcSPKcS4mAmMfyS4JQw5jXCD8U8IQ3rFdMLKPJPOMlC7+hGiOM18Q0o/Sn3vEaeP JHnOntg4/DCfCUVPn+PsH7USHi8ZXCMnoNNEbACP5TxjHRAzWNTV0hmzQi+mgvZBugxPbD LpIT7hCWWlNap/Jn17LOKi23O1d7nXGZBm+rEUBNF209yWZbzcH3hnVHbHkfwbpR0LBcN1 5yZlOkTMvpDrDGr0F1MmJpFCRS7zcGf7U4Iqd+U4ghxuXOY501W/zr0daDCukqxOzR4/g7 +DuLG2upFx4f1Gk+9yBS1rktGGGwtvRD+qBMVdPgqz/6J4rEGMo2NRs8b1fdHg== 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=1716262055; 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=zyL/hUjtaXJkh8hS5yx9JaH2t/Mb2jelejCjm3IpXIM=; b=lnytG8aSB4YSKkJkcry0FqqgEWHDH88juvoKKctjSDVVwlqy14w9HM5cJ0wakdmrmGRG9T nmtNWP6dq/wY9yiBEL9b9Dr/2L3tnC3ervNEQp6dGe9G1fG9vX++Tu+HnpQIBgKm5FHc9S aHRk5UEo7etYAS6tPcaMhZytVVnSFfMZHHWMoGrJ2LBACbAfIU/am1R7fmzv9gZWIADfKk s+TCTn1lAw0E2guOgiYQhjTLuBONXOQXiE2frjJ6VNAt88J/du7Gs2ddDjNQ9/xVSSIFzF AqpO3rJWSA+1ylNW77EeF3yKUFZ6T0o2An0FnW5d8ERFmgil0a5r2OwHNdeknw== 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 4Vk0HW2QKDz1595; Tue, 21 May 2024 03:27:35 +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 44L3RZNh052603; Tue, 21 May 2024 03:27:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44L3RZWW052600; Tue, 21 May 2024 03:27:35 GMT (envelope-from git) Date: Tue, 21 May 2024 03:27:35 GMT Message-Id: <202405210327.44L3RZWW052600@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 7aba92287947 - stable/14 - sys/dev/irdma/irdma_cm: fix compile without INET 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7aba922879474189e5694ffb92a51ab387ad3dd6 Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=7aba922879474189e5694ffb92a51ab387ad3dd6 commit 7aba922879474189e5694ffb92a51ab387ad3dd6 Author: Lexi Winter AuthorDate: 2024-04-12 16:47:16 +0000 Commit: Warner Losh CommitDate: 2024-05-21 03:10:46 +0000 sys/dev/irdma/irdma_cm: fix compile without INET irdma_get_vlan_ipv4() calls ip_ifp_find() even if INET isn't defined, in which case this function isn't available. Stub this out for the non-INET case to return an error (0xffff) instead. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1156 (cherry picked from commit 0478a0356272ab3907af9d97711f0bb8b14bf38b) --- sys/dev/irdma/irdma_cm.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/dev/irdma/irdma_cm.c b/sys/dev/irdma/irdma_cm.c index 65cb5c643783..167e3c67390c 100644 --- a/sys/dev/irdma/irdma_cm.c +++ b/sys/dev/irdma/irdma_cm.c @@ -1664,9 +1664,11 @@ irdma_get_vlan_mac_ipv6(struct iw_cm_id *cm_id, u32 *addr, u16 *vlan_id, u8 *mac u16 irdma_get_vlan_ipv4(struct iw_cm_id *cm_id, u32 *addr) { + u16 vlan_id = 0xFFFF; + +#ifdef INET if_t netdev; struct vnet *vnet = &init_net; - u16 vlan_id = 0xFFFF; #ifdef VIMAGE vnet = irdma_cmid_to_vnet(cm_id); @@ -1676,6 +1678,7 @@ irdma_get_vlan_ipv4(struct iw_cm_id *cm_id, u32 *addr) vlan_id = rdma_vlan_dev_vlan_id(netdev); dev_put(netdev); } +#endif return vlan_id; }