From owner-svn-src-all@freebsd.org  Fri Dec  2 22:25:12 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7209CC628F1;
 Fri,  2 Dec 2016 22:25:12 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 413301D15;
 Fri,  2 Dec 2016 22:25:12 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uB2MPBOK052566;
 Fri, 2 Dec 2016 22:25:11 GMT (envelope-from jhb@FreeBSD.org)
Received: (from jhb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uB2MPB3d052564;
 Fri, 2 Dec 2016 22:25:11 GMT (envelope-from jhb@FreeBSD.org)
Message-Id: <201612022225.uB2MPB3d052564@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org
 using -f
From: John Baldwin <jhb@FreeBSD.org>
Date: Fri, 2 Dec 2016 22:25:11 +0000 (UTC)
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
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Dec 2016 22:25:12 -0000

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)