Date: Fri, 20 Dec 2013 14:12:42 +0100 From: Michael Tuexen <tuexen@freebsd.org> To: Gleb Smirnoff <glebius@FreeBSD.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r259644 - head/sys/dev/ixgbe Message-ID: <79AC6A0A-D8DC-4AFC-8699-5E9D6E437C20@freebsd.org> In-Reply-To: <201312201057.rBKAvlpg010156@svn.freebsd.org> References: <201312201057.rBKAvlpg010156@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?79AC6A0A-D8DC-4AFC-8699-5E9D6E437C20>