From owner-dev-commits-src-all@freebsd.org Sun Jun 6 14:18:50 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 915CF65F552; Sun, 6 Jun 2021 14:18:50 +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 4FydsQ3jx2z4rBM; Sun, 6 Jun 2021 14:18:50 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 67E8224C4C; Sun, 6 Jun 2021 14:18:50 +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 156EIoUu033651; Sun, 6 Jun 2021 14:18:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 156EIo3u033650; Sun, 6 Jun 2021 14:18:50 GMT (envelope-from git) Date: Sun, 6 Jun 2021 14:18:50 GMT Message-Id: <202106061418.156EIo3u033650@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: a3c2c06bc938 - main - Make LINT NOINET and NOIP kernel builds warning free. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a3c2c06bc938dbb9ad2ec4a352194159e29b9146 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jun 2021 14:18:50 -0000 The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=a3c2c06bc938dbb9ad2ec4a352194159e29b9146 commit a3c2c06bc938dbb9ad2ec4a352194159e29b9146 Author: Bjoern A. Zeeb AuthorDate: 2021-06-06 14:03:06 +0000 Commit: Bjoern A. Zeeb CommitDate: 2021-06-06 14:03:06 +0000 Make LINT NOINET and NOIP kernel builds warning free. Apply #ifdef INET or #if defined(INET6) || defined(INET) to make universe NOINET and NOIP LINT kernels warning free as well again. --- sys/net/if_vxlan.c | 2 ++ sys/net/rtsock.c | 4 ++++ sys/netgraph/netflow/netflow.c | 2 ++ 3 files changed, 8 insertions(+) diff --git a/sys/net/if_vxlan.c b/sys/net/if_vxlan.c index f56ec23540a7..b03357c30c08 100644 --- a/sys/net/if_vxlan.c +++ b/sys/net/if_vxlan.c @@ -2429,6 +2429,7 @@ vxlan_encap_header(struct vxlan_softc *sc, struct mbuf *m, int ipoff, } #endif +#if defined(INET6) || defined(INET) /* * Return the CSUM_INNER_* equivalent of CSUM_* caps. */ @@ -2470,6 +2471,7 @@ csum_flags_to_inner_flags(uint32_t csum_flags_in, const uint32_t encap) return (csum_flags); } +#endif static int vxlan_encap4(struct vxlan_softc *sc, const union vxlan_sockaddr *fvxlsa, diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c index 3cb645f42e4c..07a2deaa5518 100644 --- a/sys/net/rtsock.c +++ b/sys/net/rtsock.c @@ -1007,6 +1007,7 @@ save_add_notification(struct rib_cmd_info *rc, void *_cbdata) } #endif +#if defined(INET6) || defined(INET) static struct sockaddr * alloc_sockaddr_aligned(struct linear_buffer *lb, int len) { @@ -1017,6 +1018,7 @@ alloc_sockaddr_aligned(struct linear_buffer *lb, int len) lb->offset += len; return (sa); } +#endif /*ARGSUSED*/ static int @@ -1358,6 +1360,7 @@ fill_sockaddr_inet6(struct sockaddr_in6 *sin6, const struct in6_addr *addr6, } #endif +#if defined(INET6) || defined(INET) /* * Checks if gateway is suitable for lltable operations. * Lltable code requires AF_LINK gateway with ifindex @@ -1448,6 +1451,7 @@ cleanup_xaddrs_gateway(struct rt_addrinfo *info, struct linear_buffer *lb) return (0); } +#endif static void remove_netmask(struct rt_addrinfo *info) diff --git a/sys/netgraph/netflow/netflow.c b/sys/netgraph/netflow/netflow.c index f7f0648b296f..7d4108ee59a7 100644 --- a/sys/netgraph/netflow/netflow.c +++ b/sys/netgraph/netflow/netflow.c @@ -117,6 +117,7 @@ static int hash6_insert(priv_p, struct flow_hash_entry *, struct flow6_rec *, static void expire_flow(priv_p, fib_export_p, struct flow_entry *, int); +#ifdef INET /* * Generate hash for a given flow record. * @@ -140,6 +141,7 @@ ip_hash(struct flow_rec *r) return ADDR_HASH(r->r_src.s_addr, r->r_dst.s_addr); } } +#endif #ifdef INET6 /* Generate hash for a given flow6 record. Use lower 4 octets from v6 addresses */