From owner-svn-src-head@FreeBSD.ORG  Fri Dec 20 13:12:46 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 77372E1;
 Fri, 20 Dec 2013 13:12:46 +0000 (UTC)
Received: from mail-n.franken.de (drew.ipv6.franken.de
 [IPv6:2001:638:a02:a001:20e:cff:fe4a:feaa])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 09E52134A;
 Fri, 20 Dec 2013 13:12:46 +0000 (UTC)
Received: from [192.168.1.200] (p508F063C.dip0.t-ipconnect.de [80.143.6.60])
 (Authenticated sender: macmic)
 by mail-n.franken.de (Postfix) with ESMTP id 343411C0C0693;
 Fri, 20 Dec 2013 14:12:44 +0100 (CET)
Content-Type: text/plain; charset=us-ascii
Mime-Version: 1.0 (Mac OS X Mail 6.6 \(1510\))
Subject: Re: svn commit: r259644 - head/sys/dev/ixgbe
From: Michael Tuexen <tuexen@freebsd.org>
In-Reply-To: <201312201057.rBKAvlpg010156@svn.freebsd.org>
Date: Fri, 20 Dec 2013 14:12:42 +0100
Content-Transfer-Encoding: quoted-printable
Message-Id: <79AC6A0A-D8DC-4AFC-8699-5E9D6E437C20@freebsd.org>
References: <201312201057.rBKAvlpg010156@svn.freebsd.org>
To: Gleb Smirnoff <glebius@FreeBSD.org>
X-Mailer: Apple Mail (2.1510)
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 20 Dec 2013 13:12:46 -0000

On Dec 20, 2013, at 11:57 AM, Gleb Smirnoff <glebius@FreeBSD.org> wrote:

I think you need something like

[bsd5:~/head] tuexen% svn diff
Index: sys/dev/ixgbe/ixgbe.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- sys/dev/ixgbe/ixgbe.c	(revision 259645)
+++ sys/dev/ixgbe/ixgbe.c	(working copy)
@@ -3592,8 +3592,10 @@
 static void
 ixgbe_txeof(struct tx_ring *txr)
 {
+#ifdef DEV_NETMAP
 	struct adapter		*adapter =3D txr->adapter;
 	struct ifnet		*ifp =3D adapter->ifp;
+#endif
 	u32			work, processed =3D 0;
 	u16			limit =3D txr->process_limit;
 	struct ixgbe_tx_buf	*buf;

to get it compiling if DEV_NETMAP is not defined.

Best regards
Michael

> Author: glebius
> Date: Fri Dec 20 10:57:47 2013
> New Revision: 259644
> URL: http://svnweb.freebsd.org/changeset/base/259644
>=20
> Log:
>  ixgbe(4) takes packet counters from hardware in =
ixgbe_update_stats_counters(),
>  so we don't need to do a per packet increment, which trashes cache =
line.
>=20
>  Submitted by:	oleg
>=20
> Modified:
>  head/sys/dev/ixgbe/ixgbe.c
>=20
> Modified: head/sys/dev/ixgbe/ixgbe.c
> =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
> --- head/sys/dev/ixgbe/ixgbe.c	Fri Dec 20 10:49:57 2013	=
(r259643)
> +++ head/sys/dev/ixgbe/ixgbe.c	Fri Dec 20 10:57:47 2013	=
(r259644)
> @@ -3696,7 +3696,6 @@ ixgbe_txeof(struct tx_ring *txr)
> 		}
> 		++txr->packets;
> 		++processed;
> -		++ifp->if_opackets;
> 		txr->watchdog_time =3D ticks;
>=20
> 		/* Try the next packet */
> @@ -4553,7 +4552,6 @@ ixgbe_rxeof(struct ix_queue *que)
> 			mp->m_next =3D nbuf->buf;
> 		} else { /* Sending this frame */
> 			sendmp->m_pkthdr.rcvif =3D ifp;
> -			ifp->if_ipackets++;
> 			rxr->rx_packets++;
> 			/* capture data for AIM */
> 			rxr->bytes +=3D sendmp->m_pkthdr.len;
>=20