From nobody Tue Apr 14 18:37:20 2026 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 4fwCgP1yPMz6ZFRF for ; Tue, 14 Apr 2026 18:37:21 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fwCgN6D3Gz3mFw for ; Tue, 14 Apr 2026 18:37:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776191840; 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=/f0jge+HYRW6GDYarRBqmxLf7CpSPgHVlj3vm16G8QQ=; b=gCmrwLIN0TSLtErE10/p98Zo/l1hZy4TpMjgC8+Eubewbc1PbK8S/FHZ7nS0BaNnHdxG5Z 1QwCR6sS615iVXxH1PdFmaStxKkd5TudKlFY2L3c2zbts6z52SL4ASpg2qxqEykgLK3cs1 s8iWXcVk/j4lsBp0GrU/duipOHshgBajPXWPhmvH3UtphuqfSA8KsTKbUXzuPRjMMGY1Ba Gu/byeLZ9H+LN2ky+mmqH0c26OvFSfTE/5YuzghYZCGY2MjM+kJMXs5AKZ0IDEI1nl9+l/ kXL8IqKJARQd2pSGhkXDY7Q+799QTTK57uVAeVC/GBpunOKbDl4AWFQ/rp2szA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776191840; a=rsa-sha256; cv=none; b=yFr585S8jba0rYoQfP0SJr316KII5oP0KL/885E66VGOkrde3gf5py2Q1VrfQ4kMh9sEJ3 S8y8GZwUp7GHU/HtwGZbmfTl71nMjxiZWXyvos2tRyLHPVhjOMTdmyIbn9Af2g9j6qNHfz kMjqxJKe40pWtVYHqSt0EPZ+A144wQ1hI3d8r2+ICFdU0s9RAlLO4H5kzRdqugNN2HjYrM vGxtJiWUafCZGw1zwp+AADFWHThPck9/s1k/9A6BsFWrccVkKvDHA5ynpfZSA26pW8ISd9 /cPgo2GG0BhzqEp81eSsRTB5O1jnuu6HA4ilwVpOBYW2+QDlFmV9g0NDI1PEDQ== 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=1776191840; 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=/f0jge+HYRW6GDYarRBqmxLf7CpSPgHVlj3vm16G8QQ=; b=xkEc2GeRsYIbNCOozzIfdBncWNm0N4wIS9sITk3hRi/I+qf6fgdAnKzNuvpu1L4k6/EuyT joBsDLP8TwcYOUuouE05Gl8T9Y2VnRoHNWehHem6G7yqLeMLx5m92JvU7xl8E9/v3++R+W onsD0gXWvA3a0RZnc0oJbsslClQRyVW1vy5yIvTSjmjxqMuROGyDrYPbXNVrEl1SGpZ0Hp XLH4WHJqzmhMCe5INvoe2LFrVKKfNCVGN1FIZbqpNapXyxDpoZkQMmcn4NyrFxC0yVVBkA tPtkuMgv237RyQ0Q4OVVUtO6c6ajM0vhB+7IieDJeEwlQjwTugnyHk6sBqANuQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fwCgN5Tgmz12cm for ; Tue, 14 Apr 2026 18:37:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ad29 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 14 Apr 2026 18:37:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: f4e5b45b1162 - main - if_geneve: Fix build without INET or without INET6 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f4e5b45b11628416f596b3aec2ccd3056800a171 Auto-Submitted: auto-generated Date: Tue, 14 Apr 2026 18:37:20 +0000 Message-Id: <69de8960.3ad29.4ae97873@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=f4e5b45b11628416f596b3aec2ccd3056800a171 commit f4e5b45b11628416f596b3aec2ccd3056800a171 Author: John Baldwin AuthorDate: 2026-04-14 18:28:31 +0000 Commit: John Baldwin CommitDate: 2026-04-14 18:28:31 +0000 if_geneve: Fix build without INET or without INET6 --- sys/net/if_geneve.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 49 insertions(+), 7 deletions(-) diff --git a/sys/net/if_geneve.c b/sys/net/if_geneve.c index 9562a3476099..ab8b313e860a 100644 --- a/sys/net/if_geneve.c +++ b/sys/net/if_geneve.c @@ -429,10 +429,14 @@ static void geneve_encap_header(struct geneve_softc *, struct mbuf *, static uint16_t geneve_get_ethertype(struct mbuf *); static int geneve_inherit_l3_hdr(struct mbuf *, struct geneve_softc *, uint16_t, uint8_t *, uint8_t *, u_short *); +#ifdef INET static int geneve_encap4(struct geneve_softc *, const union sockaddr_union *, struct mbuf *); +#endif +#ifdef INET6 static int geneve_encap6(struct geneve_softc *, const union sockaddr_union *, struct mbuf *); +#endif static int geneve_transmit(struct ifnet *, struct mbuf *); static void geneve_qflush(struct ifnet *); static int geneve_output(struct ifnet *, struct mbuf *, @@ -696,11 +700,13 @@ geneve_ftable_learn(struct geneve_softc *sc, const struct sockaddr *sa, geneve_sockaddr_copy(&unsa, sa); unsa.sin.sin_port = sc->gnv_dst_addr.sin.sin_port; +#ifdef INET6 if (unsa.sa.sa_family == AF_INET6) { error = sa6_embedscope(&unsa.sin6, V_ip6_use_defzone); if (error) return (error); } +#endif GENEVE_RLOCK(sc, &tracker); error = geneve_ftable_update_locked(sc, &unsa, mac, &tracker); @@ -936,10 +942,20 @@ geneve_socket_create(struct ifnet *ifp, int multicast, * must be specified when binding. */ if (multicast != 0) { - if (laddr.sa.sa_family == AF_INET) + switch (laddr.sa.sa_family) { +#ifdef INET + case AF_INET: laddr.sin.sin_addr.s_addr = INADDR_ANY; - else + break; +#endif +#ifdef INET6 + case AF_INET6: laddr.sin6.sin6_addr = in6addr_any; + break; +#endif + default: + return (EAFNOSUPPORT); + } } gnvso = geneve_socket_alloc(&laddr); if (gnvso == NULL) @@ -978,10 +994,20 @@ geneve_socket_mc_lookup(const union sockaddr_union *unsa) laddr = *unsa; - if (laddr.sa.sa_family == AF_INET) + switch (laddr.sa.sa_family) { +#ifdef INET + case AF_INET: laddr.sin.sin_addr.s_addr = INADDR_ANY; - else + break; +#endif +#ifdef INET6 + case AF_INET6: laddr.sin6.sin6_addr = in6addr_any; + break; +#endif + default: + return (NULL); + } return (geneve_socket_lookup(&laddr)); } @@ -1818,11 +1844,13 @@ geneve_set_local_addr_nl(struct geneve_softc *sc, struct nl_pstate *npt, if (error != 0) goto ret; +#ifdef INET6 if (unsa->sa.sa_family == AF_INET6) { error = sa6_embedscope(&unsa->sin6, V_ip6_use_defzone); if (error != 0) goto ret; } +#endif GENEVE_WLOCK(sc); if (geneve_can_change_config(sc)) { @@ -1856,11 +1884,13 @@ geneve_set_remote_addr_nl(struct geneve_softc *sc, struct nl_pstate *npt, if (error != 0) goto ret; +#ifdef INET6 if (unsa->sa.sa_family == AF_INET6) { error = sa6_embedscope(&unsa->sin6, V_ip6_use_defzone); if (error != 0) goto ret; } +#endif GENEVE_WLOCK(sc); if (geneve_can_change_config(sc)) { @@ -2486,6 +2516,7 @@ geneve_inherit_l3_hdr(struct mbuf *m, struct geneve_softc *sc, uint16_t proto, return (0); } +#ifdef INET static int geneve_encap4(struct geneve_softc *sc, const union sockaddr_union *funsa, struct mbuf *m) @@ -2604,7 +2635,9 @@ geneve_encap4(struct geneve_softc *sc, const union sockaddr_union *funsa, return (error); } +#endif +#ifdef INET6 static int geneve_encap6(struct geneve_softc *sc, const union sockaddr_union *funsa, struct mbuf *m) @@ -2744,6 +2777,7 @@ geneve_encap6(struct geneve_softc *sc, const union sockaddr_union *funsa, return (error); } +#endif static int geneve_transmit(struct ifnet *ifp, struct mbuf *m) @@ -2795,12 +2829,20 @@ geneve_transmit(struct ifnet *ifp, struct mbuf *m) GENEVE_ACQUIRE(sc); GENEVE_RUNLOCK(sc, &tracker); - if (af == AF_INET) + switch (af) { +#ifdef INET + case AF_INET: error = geneve_encap4(sc, &unsa, m); - else if (af == AF_INET6) + break; +#endif +#ifdef INET6 + case AF_INET6: error = geneve_encap6(sc, &unsa, m); - else + break; +#endif + default: error = EAFNOSUPPORT; + } geneve_release(sc); if (mcifp != NULL)