From owner-svn-src-all@FreeBSD.ORG  Wed Aug 15 17:12:41 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 014521065673;
	Wed, 15 Aug 2012 17:12:41 +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 E06618FC0A;
	Wed, 15 Aug 2012 17:12:40 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7FHCeWU084368;
	Wed, 15 Aug 2012 17:12:40 GMT (envelope-from jfv@svn.freebsd.org)
Received: (from jfv@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7FHCeUf084366;
	Wed, 15 Aug 2012 17:12:40 GMT (envelope-from jfv@svn.freebsd.org)
Message-Id: <201208151712.q7FHCeUf084366@svn.freebsd.org>
From: Jack F Vogel <jfv@FreeBSD.org>
Date: Wed, 15 Aug 2012 17:12:40 +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: r239304 - head/sys/dev/e1000
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 15 Aug 2012 17:12:41 -0000

Author: jfv
Date: Wed Aug 15 17:12:40 2012
New Revision: 239304
URL: http://svn.freebsd.org/changeset/base/239304

Log:
  Customer report of a panic on boot due to the old
  "m_getjcl:invalid cluster type" that occurred some
  time back with the igb driver. This happens often when
  booting over the net. I believe the NIC hardware is left
  in a warm state when handed over to the driver, and a stray
  RX interrupt happens earlier than the code is prepared for
  it to happen. This change was verified to fix the problem,
  its kind of a bandaid... but it is similar to what was done
  in the igb code.

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

Modified: head/sys/dev/e1000/if_em.c
==============================================================================
--- head/sys/dev/e1000/if_em.c	Wed Aug 15 16:19:39 2012	(r239303)
+++ head/sys/dev/e1000/if_em.c	Wed Aug 15 17:12:40 2012	(r239304)
@@ -1570,6 +1570,8 @@ em_msix_rx(void *arg)
 	bool		more;
 
 	++rxr->rx_irq;
+	if (!(adapter->ifp->if_drv_flags & IFF_DRV_RUNNING))
+		return;
 	more = em_rxeof(rxr, adapter->rx_process_limit, NULL);
 	if (more)
 		taskqueue_enqueue(rxr->tq, &rxr->rx_task);