From owner-svn-src-head@FreeBSD.ORG  Tue Sep  7 21:28:45 2010
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 63BBB10656D7;
	Tue,  7 Sep 2010 21:28:45 +0000 (UTC) (envelope-from jfv@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5382B8FC17;
	Tue,  7 Sep 2010 21:28:45 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o87LSjXc036441;
	Tue, 7 Sep 2010 21:28:45 GMT (envelope-from jfv@svn.freebsd.org)
Received: (from jfv@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o87LSjWB036439;
	Tue, 7 Sep 2010 21:28:45 GMT (envelope-from jfv@svn.freebsd.org)
Message-Id: <201009072128.o87LSjWB036439@svn.freebsd.org>
From: Jack F Vogel <jfv@FreeBSD.org>
Date: Tue, 7 Sep 2010 21:28:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r212304 - head/sys/dev/e1000
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Tue, 07 Sep 2010 21:28:45 -0000

Author: jfv
Date: Tue Sep  7 21:28:45 2010
New Revision: 212304
URL: http://svn.freebsd.org/changeset/base/212304

Log:
  Code correction in refresh_mbufs, just continuing
  without index recalc was wrong.

Modified:
  head/sys/dev/e1000/if_em.c

Modified: head/sys/dev/e1000/if_em.c
==============================================================================
--- head/sys/dev/e1000/if_em.c	Tue Sep  7 20:13:08 2010	(r212303)
+++ head/sys/dev/e1000/if_em.c	Tue Sep  7 21:28:45 2010	(r212304)
@@ -3696,7 +3696,7 @@ em_refresh_mbufs(struct rx_ring *rxr, in
 		** and are to be reused.
 		*/
 		if (rxbuf->m_head != NULL)
-			continue;
+			goto reuse;
 		m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
 		/*
 		** If we have a temporary resource shortage
@@ -3726,7 +3726,7 @@ em_refresh_mbufs(struct rx_ring *rxr, in
 		    rxbuf->map, BUS_DMASYNC_PREREAD);
 		rxbuf->m_head = m;
 		rxr->rx_base[i].buffer_addr = htole64(segs[0].ds_addr);
-
+reuse:
 		cleaned = i;
 		/* Calculate next index */
 		if (++i == adapter->num_rx_desc)