From nobody Fri Apr 12 16:52:54 2024 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 4VGN0l3W9hz5HjRL; Fri, 12 Apr 2024 16:52:55 +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 4VGN0l0hhnz3xC7; Fri, 12 Apr 2024 16:52:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712940775; 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=/QSa8MQsflthSQ5lokVgSQOj+eBq14SyzEMwzJb/Of4=; b=gs+xrUFNxmLZdw9Ma7uftndv2xpMNO8iAtEXBQT9MiiJmL3Lf8o8wIKWFXjNQQfYSX6IeK d4/OF9QuE2hH99n1aCx4q33T29DCod+Y+S8qSgMLgePupTON+dkpR2rCWnVMhsMDJ+JdrX ez8OZqffCzuJwl79LxNaZgwn+MZ9yQX/65hji4y1nPjT86M2s4F4Iqc3jGTklADWliEmPi Ejghqrp3VhLDQPL0vp6Y5tyszImDUXBtCGY/Ik9mO9YsjliwCIJBOd/ITTrc1eCau9qNK8 NeIL9CzjRYu58hMksp/Ejq4axZzVVLMd76HnfUtEDtC2ZywH5k6C7+jffb6u+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712940775; a=rsa-sha256; cv=none; b=Hof4BvgQ3M9e8ZKwAvAxu61Jc6AvNLGDzjYmLQO8Jj+WWs4P0j4Ozv5hFS2FORK8S7W33V xaywFASc0FcJ+5BZMfNOkRPhqJ8MtClhxUY8Yqpoa/yBFOu3kViD2YK+XiVJjipYT+Kc6I CHdhRtKX613A301452V2qvoiqnRyBLQs7FQPRPThAaH4J/m1vESOd3Z9GaU9KpR6faMHgA gykV/gMUXaLQmRtdCk+zAMrViPscOiSb6wKQ0/e4kqhATOcvNeS5hNDad+9Z1FQ9Qaf3a0 7+VxipSVYvw8+8X5fT8gwCPbPxptOhL2m3nKXSuw4zLascpAoRsGq/oYmPI6YQ== 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=1712940775; 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=/QSa8MQsflthSQ5lokVgSQOj+eBq14SyzEMwzJb/Of4=; b=PO88ruFxar5hWFIIJ3RPMAL6kqjHlxUIQuZj2vQeVsIjh3inBubJVd5YOLsJntsqpDj1nH IVKk9dLRgcpArQo5CqQSzpTY3mA6SHG/rv3D9xYPn0e1uCEQ3WDOFEWTTnUzo50jDH/nnE rlCAgX/iSWaHHAG6L+ZwmATou4Z6cm9IBQGv1rO5N/fSv4ah5Wai7SxR0aLP4pZjzOB5lp lVe2QQ8fZVE/ZfhZ3iMoEUIRwVxv7ENeYNcoIWcJb8x2kJhts5BNWO10C8Ffircd6Z/THw NpSYtW009LHjixei7U2aRvoRCyLVa3fKdR1lIqDu3xoi9UXVYL/AkB0Uh8ctvg== 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 4VGN0l0KC6zxlM; Fri, 12 Apr 2024 16:52:55 +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 43CGqsno040093; Fri, 12 Apr 2024 16:52:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43CGqskI040090; Fri, 12 Apr 2024 16:52:54 GMT (envelope-from git) Date: Fri, 12 Apr 2024 16:52:54 GMT Message-Id: <202404121652.43CGqskI040090@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 0478a0356272 - main - sys/dev/irdma/irdma_cm: fix compile without INET 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 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/main X-Git-Reftype: branch X-Git-Commit: 0478a0356272ab3907af9d97711f0bb8b14bf38b Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=0478a0356272ab3907af9d97711f0bb8b14bf38b commit 0478a0356272ab3907af9d97711f0bb8b14bf38b Author: Lexi Winter AuthorDate: 2024-04-12 16:47:16 +0000 Commit: Warner Losh CommitDate: 2024-04-12 16:47:19 +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 --- 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; }