From owner-svn-src-head@freebsd.org  Wed May 16 22:25:48 2018
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1B8D2ED9598;
 Wed, 16 May 2018 22:25:48 +0000 (UTC)
 (envelope-from mmacy@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id B2E8D7F626;
 Wed, 16 May 2018 22:25:47 +0000 (UTC)
 (envelope-from mmacy@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8FADE203FF;
 Wed, 16 May 2018 22:25:47 +0000 (UTC)
 (envelope-from mmacy@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4GMPlbJ070569;
 Wed, 16 May 2018 22:25:47 GMT (envelope-from mmacy@FreeBSD.org)
Received: (from mmacy@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4GMPlhe070568;
 Wed, 16 May 2018 22:25:47 GMT (envelope-from mmacy@FreeBSD.org)
Message-Id: <201805162225.w4GMPlhe070568@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mmacy set sender to
 mmacy@FreeBSD.org using -f
From: Matt Macy <mmacy@FreeBSD.org>
Date: Wed, 16 May 2018 22:25:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r333689 - head/sys/net
X-SVN-Group: head
X-SVN-Commit-Author: mmacy
X-SVN-Commit-Paths: head/sys/net
X-SVN-Commit-Revision: 333689
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.26
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 16 May 2018 22:25:48 -0000

Author: mmacy
Date: Wed May 16 22:25:47 2018
New Revision: 333689
URL: https://svnweb.freebsd.org/changeset/base/333689

Log:
  Fix !netmap build post r333686
  
  Approved by:	sbruno

Modified:
  head/sys/net/iflib.c

Modified: head/sys/net/iflib.c
==============================================================================
--- head/sys/net/iflib.c	Wed May 16 21:07:12 2018	(r333688)
+++ head/sys/net/iflib.c	Wed May 16 22:25:47 2018	(r333689)
@@ -3722,12 +3722,14 @@ _task_fn_tx(void *context)
 		if (ctx->isc_txd_credits_update(ctx->ifc_softc, txq->ift_id, false))
 			netmap_tx_irq(ifp, txq->ift_id);
 		else {
+#ifdef DEV_NETMAP			
 			if (!(ctx->ifc_flags & IFC_NETMAP_TX_IRQ)) {
 				struct netmap_kring *kring = NA(ctx->ifc_ifp)->tx_rings[txq->ift_id];
 
 				if (kring->nr_hwtail != nm_prev(kring->rhead, kring->nkr_num_slots - 1))
 					GROUPTASK_ENQUEUE(&txq->ift_task);
 			}
+#endif			
 		}
 		IFDI_TX_QUEUE_INTR_ENABLE(ctx, txq->ift_id);
 		return;