svn commit: r259644 - head/sys/dev/ixgbe

[Michael Tuexen]

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

I think you need something like

[bsd5:~/head] tuexen% svn diff
Index: sys/dev/ixgbe/ixgbe.c
===================================================================
--- 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 = txr->adapter;
 	struct ifnet		*ifp = adapter->ifp;
+#endif
 	u32			work, processed = 0;
 	u16			limit = 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
> 
> 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.
> 
>  Submitted by:	oleg
> 
> Modified:
>  head/sys/dev/ixgbe/ixgbe.c
> 
> Modified: head/sys/dev/ixgbe/ixgbe.c
> ==============================================================================
> --- 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 = ticks;
> 
> 		/* Try the next packet */
> @@ -4553,7 +4552,6 @@ ixgbe_rxeof(struct ix_queue *que)
> 			mp->m_next = nbuf->buf;
> 		} else { /* Sending this frame */
> 			sendmp->m_pkthdr.rcvif = ifp;
> -			ifp->if_ipackets++;
> 			rxr->rx_packets++;
> 			/* capture data for AIM */
> 			rxr->bytes += sendmp->m_pkthdr.len;
>