From owner-svn-src-releng@FreeBSD.ORG  Tue Aug  6 21:16:01 2013
Return-Path: <owner-svn-src-releng@FreeBSD.ORG>
Delivered-To: svn-src-releng@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 11EC657B;
 Tue,  6 Aug 2013 21:16:01 +0000 (UTC) (envelope-from jfv@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id F352525C2;
 Tue,  6 Aug 2013 21:16:00 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r76LG0uE064514;
 Tue, 6 Aug 2013 21:16:00 GMT (envelope-from jfv@svn.freebsd.org)
Received: (from jfv@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r76LG0SL064513;
 Tue, 6 Aug 2013 21:16:00 GMT (envelope-from jfv@svn.freebsd.org)
Message-Id: <201308062116.r76LG0SL064513@svn.freebsd.org>
From: Jack F Vogel <jfv@FreeBSD.org>
Date: Tue, 6 Aug 2013 21:16:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-releng@freebsd.org
Subject: svn commit: r254009 - releng/9.2/sys/dev/e1000
X-SVN-Group: releng
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-releng@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the release engineering / security commits to
 the src tree <svn-src-releng.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-releng>,
 <mailto:svn-src-releng-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-releng>
List-Post: <mailto:svn-src-releng@freebsd.org>
List-Help: <mailto:svn-src-releng-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-releng>,
 <mailto:svn-src-releng-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Aug 2013 21:16:01 -0000

Author: jfv
Date: Tue Aug  6 21:16:00 2013
New Revision: 254009
URL: http://svnweb.freebsd.org/changeset/base/254009

Log:
  When the igb driver is static there are cases when early interrupts occur,
  resulting in a panic in refresh_mbufs, to prevent this add a check to the
  interrupt handler for DRV_RUNNING.
  
  Approved by: re

Modified:
  releng/9.2/sys/dev/e1000/if_igb.c
Directory Properties:
  releng/9.2/sys/   (props changed)
  releng/9.2/sys/dev/   (props changed)
  releng/9.2/sys/dev/e1000/   (props changed)

Modified: releng/9.2/sys/dev/e1000/if_igb.c
==============================================================================
--- releng/9.2/sys/dev/e1000/if_igb.c	Tue Aug  6 21:01:38 2013	(r254008)
+++ releng/9.2/sys/dev/e1000/if_igb.c	Tue Aug  6 21:16:00 2013	(r254009)
@@ -1572,6 +1572,10 @@ igb_msix_que(void *arg)
 	u32		newitr = 0;
 	bool		more_rx;
 
+	/* Ignore spurious interrupts */
+	if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0)
+		return;
+
 	E1000_WRITE_REG(&adapter->hw, E1000_EIMC, que->eims);
 	++que->irqs;