svn commit: r241366 - stable/9/sys/dev/e1000

[Sean Bruno]

Author: sbruno
Date: Tue Oct  9 03:41:59 2012
New Revision: 241366
URL: http://svn.freebsd.org/changeset/base/241366

Log:
  MFC r240879
  
  This patch fixes a nit in the em, lem, and igb driver statistics.  Increment
  adapter->dropped_pkts instead of if_ierrors because if_ierrors is
  overwritten by hw stats collection.
  
  Submitted by:	Andrew Boyer <aboyer at averesystems.com>
  Reviewed by:	Jack F Vogel <jfv at freebsd.org>

Modified:
  stable/9/sys/dev/e1000/if_em.c
  stable/9/sys/dev/e1000/if_igb.c
  stable/9/sys/dev/e1000/if_lem.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)
  stable/9/sys/dev/e1000/   (props changed)

Modified: stable/9/sys/dev/e1000/if_em.c
==============================================================================
--- stable/9/sys/dev/e1000/if_em.c	Tue Oct  9 03:11:15 2012	(r241365)
+++ stable/9/sys/dev/e1000/if_em.c	Tue Oct  9 03:41:59 2012	(r241366)
@@ -4434,7 +4434,7 @@ em_rxeof(struct rx_ring *rxr, int count,
 
 		if ((cur->errors & E1000_RXD_ERR_FRAME_ERR_MASK) ||
 		    (rxr->discard == TRUE)) {
-			ifp->if_ierrors++;
+			adapter->dropped_pkts++;
 			++rxr->rx_discarded;
 			if (!eop) /* Catch subsequent segs */
 				rxr->discard = TRUE;

Modified: stable/9/sys/dev/e1000/if_igb.c
==============================================================================
--- stable/9/sys/dev/e1000/if_igb.c	Tue Oct  9 03:11:15 2012	(r241365)
+++ stable/9/sys/dev/e1000/if_igb.c	Tue Oct  9 03:41:59 2012	(r241366)
@@ -4752,7 +4752,7 @@ igb_rxeof(struct igb_queue *que, int cou
 		/* Make sure all segments of a bad packet are discarded */
 		if (((staterr & E1000_RXDEXT_ERR_FRAME_ERR_MASK) != 0) ||
 		    (rxr->discard)) {
-			ifp->if_ierrors++;
+			adapter->dropped_pkts++;
 			++rxr->rx_discarded;
 			if (!eop) /* Catch subsequent segs */
 				rxr->discard = TRUE;

Modified: stable/9/sys/dev/e1000/if_lem.c
==============================================================================
--- stable/9/sys/dev/e1000/if_lem.c	Tue Oct  9 03:11:15 2012	(r241365)
+++ stable/9/sys/dev/e1000/if_lem.c	Tue Oct  9 03:41:59 2012	(r241366)
@@ -3597,7 +3597,7 @@ skip:
 				adapter->lmp = NULL;
 			}
 		} else {
-			ifp->if_ierrors++;
+			adapter->dropped_pkts++;
 discard:
 			/* Reuse loaded DMA map and just update mbuf chain */
 			mp = adapter->rx_buffer_area[i].m_head;