From nobody Wed Oct 20 14:11:23 2021 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 BC6AB17F7B72; Wed, 20 Oct 2021 14:11:23 +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 4HZCG350rwz4spk; Wed, 20 Oct 2021 14:11:23 +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 8CA1DE9D; Wed, 20 Oct 2021 14:11:23 +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 19KEBNdr024005; Wed, 20 Oct 2021 14:11:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19KEBNKi024004; Wed, 20 Oct 2021 14:11:23 GMT (envelope-from git) Date: Wed, 20 Oct 2021 14:11:23 GMT Message-Id: <202110201411.19KEBNKi024004@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Navdeep Parhar Subject: git: fed21efcfce4 - stable/13 - cxgbe(4): Fix build warnings with NOINET kernels. 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: fed21efcfce40fe2cbbc99322662f200f3532505 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=fed21efcfce40fe2cbbc99322662f200f3532505 commit fed21efcfce40fe2cbbc99322662f200f3532505 Author: Navdeep Parhar AuthorDate: 2021-05-22 03:42:04 +0000 Commit: Navdeep Parhar CommitDate: 2021-10-20 14:07:47 +0000 cxgbe(4): Fix build warnings with NOINET kernels. MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D26334 (cherry picked from commit ffbb373c5a95c37be693330a76a093fbcf546440) --- sys/dev/cxgbe/t4_sge.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/sys/dev/cxgbe/t4_sge.c b/sys/dev/cxgbe/t4_sge.c index 2f6c7e2e7914..44fef6dfc633 100644 --- a/sys/dev/cxgbe/t4_sge.c +++ b/sys/dev/cxgbe/t4_sge.c @@ -333,7 +333,9 @@ static void drain_wrq_wr_list(struct adapter *, struct sge_wrq *); static int sysctl_bufsizes(SYSCTL_HANDLER_ARGS); #ifdef RATELIMIT +#if defined(INET) || defined(INET6) static inline u_int txpkt_eo_len16(u_int, u_int, u_int); +#endif static int ethofld_fw4_ack(struct sge_iq *, const struct rss_header *, struct mbuf *); #endif @@ -1497,12 +1499,14 @@ service_iq(struct sge_iq *iq, int budget) return (0); } +#if defined(INET) || defined(INET6) static inline int sort_before_lro(struct lro_ctrl *lro) { return (lro->lro_mbuf_max != 0); } +#endif static inline uint64_t last_flit_to_ns(struct adapter *sc, uint64_t lf) @@ -2311,6 +2315,7 @@ mbuf_eo_nsegs(struct mbuf *m) return (m->m_pkthdr.PH_loc.eight[1]); } +#if defined(INET) || defined(INET6) static inline void set_mbuf_eo_nsegs(struct mbuf *m, uint8_t nsegs) { @@ -2318,6 +2323,7 @@ set_mbuf_eo_nsegs(struct mbuf *m, uint8_t nsegs) M_ASSERTPKTHDR(m); m->m_pkthdr.PH_loc.eight[1] = nsegs; } +#endif static inline int mbuf_eo_len16(struct mbuf *m) @@ -2331,6 +2337,7 @@ mbuf_eo_len16(struct mbuf *m) return (n); } +#if defined(INET) || defined(INET6) static inline void set_mbuf_eo_len16(struct mbuf *m, uint8_t len16) { @@ -2338,6 +2345,7 @@ set_mbuf_eo_len16(struct mbuf *m, uint8_t len16) M_ASSERTPKTHDR(m); m->m_pkthdr.PH_loc.eight[2] = len16; } +#endif static inline int mbuf_eo_tsclk_tsoff(struct mbuf *m) @@ -2347,6 +2355,7 @@ mbuf_eo_tsclk_tsoff(struct mbuf *m) return (m->m_pkthdr.PH_loc.eight[3]); } +#if defined(INET) || defined(INET6) static inline void set_mbuf_eo_tsclk_tsoff(struct mbuf *m, uint8_t tsclk_tsoff) { @@ -2354,6 +2363,7 @@ set_mbuf_eo_tsclk_tsoff(struct mbuf *m, uint8_t tsclk_tsoff) M_ASSERTPKTHDR(m); m->m_pkthdr.PH_loc.eight[3] = tsclk_tsoff; } +#endif static inline int needs_eo(struct m_snd_tag *mst) @@ -2434,6 +2444,7 @@ needs_vxlan_tso(struct mbuf *m) (m->m_pkthdr.csum_flags & csum_flags) != CSUM_ENCAP_VXLAN); } +#if defined(INET) || defined(INET6) static inline bool needs_inner_tcp_csum(struct mbuf *m) { @@ -2443,6 +2454,7 @@ needs_inner_tcp_csum(struct mbuf *m) return (m->m_pkthdr.csum_flags & csum_flags); } +#endif static inline bool needs_l3_csum(struct mbuf *m) @@ -6393,6 +6405,7 @@ sysctl_bufsizes(SYSCTL_HANDLER_ARGS) } #ifdef RATELIMIT +#if defined(INET) || defined(INET6) /* * len16 for a txpkt WR with a GL. Includes the firmware work request header. */ @@ -6416,6 +6429,7 @@ txpkt_eo_len16(u_int nsegs, u_int immhdrs, u_int tso) done: return (howmany(n, 16)); } +#endif #define ETID_FLOWC_NPARAMS 6 #define ETID_FLOWC_LEN (roundup2((sizeof(struct fw_flowc_wr) + \