From owner-svn-src-head@FreeBSD.ORG  Sat Jan 12 16:05:56 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 2542B39F;
 Sat, 12 Jan 2013 16:05:56 +0000 (UTC) (envelope-from smh@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 13CA7E6B;
 Sat, 12 Jan 2013 16:05:56 +0000 (UTC)
Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0CG5tDi084027;
 Sat, 12 Jan 2013 16:05:55 GMT (envelope-from smh@svn.freebsd.org)
Received: (from smh@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0CG5tcd084026;
 Sat, 12 Jan 2013 16:05:55 GMT (envelope-from smh@svn.freebsd.org)
Message-Id: <201301121605.r0CG5tcd084026@svn.freebsd.org>
From: Steven Hartland <smh@FreeBSD.org>
Date: Sat, 12 Jan 2013 16:05:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r245334 - head/sys/dev/e1000
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
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: Sat, 12 Jan 2013 16:05:56 -0000

Author: smh
Date: Sat Jan 12 16:05:55 2013
New Revision: 245334
URL: http://svnweb.freebsd.org/changeset/base/245334

Log:
  Fixed mbuf free when receive structures fail to allocate.
  
  This prevents quad igb card on high core machines, without any nmbcluster or
  igb queue tuning wedging the boot process if all nics are configured.
  
  Reviewed by:	jfv
  Approved by:	pjd (mentor)
  MFC after:	1 week

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

Modified: head/sys/dev/e1000/if_igb.c
==============================================================================
--- head/sys/dev/e1000/if_igb.c	Sat Jan 12 16:01:58 2013	(r245333)
+++ head/sys/dev/e1000/if_igb.c	Sat Jan 12 16:05:55 2013	(r245334)
@@ -4330,8 +4330,8 @@ fail:
 	 * the rings that completed, the failing case will have
 	 * cleaned up for itself. 'i' is the endpoint.
 	 */
-	for (int j = 0; j > i; ++j) {
-		rxr = &adapter->rx_rings[i];
+	for (int j = 0; j < i; ++j) {
+		rxr = &adapter->rx_rings[j];
 		IGB_RX_LOCK(rxr);
 		igb_free_receive_ring(rxr);
 		IGB_RX_UNLOCK(rxr);