Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 2 Dec 2016 22:25:11 +0000 (UTC)
From:      John Baldwin <jhb@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject:   svn commit: r309445 - stable/10/sys/dev/cxgbe/tom
Message-ID:  <201612022225.uB2MPB3d052564@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jhb
Date: Fri Dec  2 22:25:11 2016
New Revision: 309445
URL: https://svnweb.freebsd.org/changeset/base/309445

Log:
  Fix build without INVARIANTS.
  
  This is a direct commit to stable/10.

Modified:
  stable/10/sys/dev/cxgbe/tom/t4_cpl_io.c
  stable/10/sys/dev/cxgbe/tom/t4_tom.c

Modified: stable/10/sys/dev/cxgbe/tom/t4_cpl_io.c
==============================================================================
--- stable/10/sys/dev/cxgbe/tom/t4_cpl_io.c	Fri Dec  2 21:36:21 2016	(r309444)
+++ stable/10/sys/dev/cxgbe/tom/t4_cpl_io.c	Fri Dec  2 22:25:11 2016	(r309445)
@@ -1713,7 +1713,9 @@ do_fw4_ack(struct sge_iq *iq, const stru
 int
 do_set_tcb_rpl(struct sge_iq *iq, const struct rss_header *rss, struct mbuf *m)
 {
+#ifdef INVARIANTS
 	struct adapter *sc = iq->adapter;
+#endif
 	const struct cpl_set_tcb_rpl *cpl = (const void *)(rss + 1);
 	unsigned int tid = GET_TID(cpl);
 #ifdef INVARIANTS

Modified: stable/10/sys/dev/cxgbe/tom/t4_tom.c
==============================================================================
--- stable/10/sys/dev/cxgbe/tom/t4_tom.c	Fri Dec  2 21:36:21 2016	(r309444)
+++ stable/10/sys/dev/cxgbe/tom/t4_tom.c	Fri Dec  2 22:25:11 2016	(r309445)
@@ -123,6 +123,7 @@ mbufq_drain(struct mbufq *q)
 	q->tail = NULL;
 }
 
+#ifdef INVARIANTS
 static inline int
 mbufq_len(const struct mbufq *q)
 {
@@ -134,6 +135,7 @@ mbufq_len(const struct mbufq *q)
 		len++;
 	return (len);
 }
+#endif
 	
 struct toepcb *
 alloc_toepcb(struct vi_info *vi, int txqid, int rxqid, int flags)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612022225.uB2MPB3d052564>