From nobody Tue May 21 20:09:15 2024 X-Original-To: dev-commits-src-branches@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 4VkQWH3XCPz5M8wM; Tue, 21 May 2024 20:09:15 +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 4VkQWH2xryz4Dlk; Tue, 21 May 2024 20:09:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716322155; 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=7k3ARsHqeo57m/anayCQ6XEtJ/+A4skF3yOBVPcqD08=; b=DWcV7CUBtGIlohynX3UmLOfScSg8/KbobYfilAfgazmBjm/JduxZUGh7/GA0kljFZ3wuDC v1RW1ri83ekupA1ivSQXol/aTtp7Vkr7NG7PJmBCCimJ8XijDJamXE++G9WIBiQi+KYAHI +WcfiaDh7rP+erHN5LZ08fOWcEHzcTEssyltrzZdckAprQCPJ+Aa53FKrsHQ+0s4BLN0Za 3+JbajMCdhebfbpjq8J9FvVp41uSn+QeOuOn16oIfbTPgXKVJsbORFZutwNVxVcOud1lO5 JkUEazNjXTfMhUmHtZanQnaa0XPg8AuTFXs8AhqzWHI2tCB4WTX5d1tXc+wPEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716322155; a=rsa-sha256; cv=none; b=OUqSZY5973C2nNyi+EC8AsNBbkch1ubX7QGc5r92G31OCudHZgK4id1ipy18gFKKywY+e1 +niCpd+VgzlUS8ghHcROAY9/hKiH9EtPeEOew13UmEbpEt3sQCUK9RY13PMRSqE0NNmYzZ v9XHRuIdar/MupxHp8CgxvZnMQoiHilf81YoHFhR9IEXwOybxN1qcCXfZQXq7CoobKieJ0 j5w5R2bUXbbhgsh+zYp6cOoQEqxzI4pr7HetcBZrBc+JHZJEdVuwxXiYLtN/z4DmqPg/3y gNwgGfYF9ILc7s50jKr0SUvHsaBknfdPaJyt7uEMFv1y9KY0tp8hzKdhYQJ0Jg== 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=1716322155; 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=7k3ARsHqeo57m/anayCQ6XEtJ/+A4skF3yOBVPcqD08=; b=J/Y3ZG0w2X0A3/HT/F2UF2O9s5JNzE8jYw1b6hfBG9DG1f0YLwXWhEfxela8Wu7RuzjQzq LwldAa6RybEZFtp8ApB6fnQTTzDvCStm7DLx4kDGfzmf31OHHwGV42F6mYUhoQigRrwrFO C291uxPhyaOJjpHBvIusJrQNhhxjTnrPdm72zG45YlX6XATvX3Ru51wCt5pgLVmW5s9DFC D56Is0pO3VnriorCrDBMdLAmO3FeNzlGkHJPVw91rf/In5OoJJe49X9vEZ9/+QJoUFaSzX BY2nh4Z1Huq0QHlhbZHSefpAUe4o70oDbQAzyAR2eQExxbPNc+36TMBA7N78TA== 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 4VkQWH2XsRzbc4; Tue, 21 May 2024 20:09:15 +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 44LK9FEx043702; Tue, 21 May 2024 20:09:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44LK9F1o043699; Tue, 21 May 2024 20:09:15 GMT (envelope-from git) Date: Tue, 21 May 2024 20:09:15 GMT Message-Id: <202405212009.44LK9F1o043699@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: 78ccc5af3d23 - releng/14.1 - sys/dev/irdma/irdma_cm: fix compile without INET List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/releng/14.1 X-Git-Reftype: branch X-Git-Commit: 78ccc5af3d23fe6c7d87c5f40cf6ab2b1d9d6fb2 Auto-Submitted: auto-generated The branch releng/14.1 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=78ccc5af3d23fe6c7d87c5f40cf6ab2b1d9d6fb2 commit 78ccc5af3d23fe6c7d87c5f40cf6ab2b1d9d6fb2 Author: Lexi Winter AuthorDate: 2024-04-12 16:47:16 +0000 Commit: Warner Losh CommitDate: 2024-05-21 20:08:35 +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) (cherry picked from commit 7aba922879474189e5694ffb92a51ab387ad3dd6) Approved-by: re (cperciva) --- 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; }