From owner-svn-src-all@FreeBSD.ORG  Fri Dec 20 13:17:02 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id D260F497;
 Fri, 20 Dec 2013 13:17:02 +0000 (UTC)
Received: from cell.glebius.int.ru (glebius.int.ru [81.19.69.10])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4CD011387;
 Fri, 20 Dec 2013 13:17:01 +0000 (UTC)
Received: from cell.glebius.int.ru (localhost [127.0.0.1])
 by cell.glebius.int.ru (8.14.7/8.14.7) with ESMTP id rBKDGxm6077345
 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO);
 Fri, 20 Dec 2013 17:16:59 +0400 (MSK)
 (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
 by cell.glebius.int.ru (8.14.7/8.14.7/Submit) id rBKDGx7c077344;
 Fri, 20 Dec 2013 17:16:59 +0400 (MSK)
 (envelope-from glebius@FreeBSD.org)
X-Authentication-Warning: cell.glebius.int.ru: glebius set sender to
 glebius@FreeBSD.org using -f
Date: Fri, 20 Dec 2013 17:16:59 +0400
From: Gleb Smirnoff <glebius@FreeBSD.org>
To: Michael Tuexen <tuexen@freebsd.org>
Subject: Re: svn commit: r259644 - head/sys/dev/ixgbe
Message-ID: <20131220131659.GQ71033@FreeBSD.org>
References: <201312201057.rBKAvlpg010156@svn.freebsd.org>
 <79AC6A0A-D8DC-4AFC-8699-5E9D6E437C20@freebsd.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <79AC6A0A-D8DC-4AFC-8699-5E9D6E437C20@freebsd.org>
User-Agent: Mutt/1.5.22 (2013-10-16)
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
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: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 20 Dec 2013 13:17:02 -0000

On Fri, Dec 20, 2013 at 02:12:42PM +0100, Michael Tuexen wrote:
M> On Dec 20, 2013, at 11:57 AM, Gleb Smirnoff <glebius@FreeBSD.org> wrote:
M> 
M> I think you need something like
M> 
M> [bsd5:~/head] tuexen% svn diff
M> Index: sys/dev/ixgbe/ixgbe.c
M> ===================================================================
M> --- sys/dev/ixgbe/ixgbe.c	(revision 259645)
M> +++ sys/dev/ixgbe/ixgbe.c	(working copy)
M> @@ -3592,8 +3592,10 @@
M>  static void
M>  ixgbe_txeof(struct tx_ring *txr)
M>  {
M> +#ifdef DEV_NETMAP
M>  	struct adapter		*adapter = txr->adapter;
M>  	struct ifnet		*ifp = adapter->ifp;
M> +#endif
M>  	u32			work, processed = 0;
M>  	u16			limit = txr->process_limit;
M>  	struct ixgbe_tx_buf	*buf;
M> 
M> to get it compiling if DEV_NETMAP is not defined.

Thanks, Michael. And sorry for broken build.

-- 
Totus tuus, Glebius.