From owner-svn-soc-all@FreeBSD.ORG  Sun Jun  7 19:53:19 2015
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 8776A3B5
 for <svn-soc-all@FreeBSD.org>; Sun,  7 Jun 2015 19:53:19 +0000 (UTC)
 (envelope-from iateaca@FreeBSD.org)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::50:2])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 75980138A
 for <svn-soc-all@FreeBSD.org>; Sun,  7 Jun 2015 19:53:19 +0000 (UTC)
 (envelope-from iateaca@FreeBSD.org)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id t57JrJXX098985
 for <svn-soc-all@FreeBSD.org>; Sun, 7 Jun 2015 19:53:19 GMT
 (envelope-from iateaca@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t57JrILa098981
 for svn-soc-all@FreeBSD.org; Sun, 7 Jun 2015 19:53:18 GMT
 (envelope-from iateaca@FreeBSD.org)
Date: Sun, 7 Jun 2015 19:53:18 GMT
Message-Id: <201506071953.t57JrILa098981@socsvn.freebsd.org>
X-Authentication-Warning: socsvn.freebsd.org: www set sender to
 iateaca@FreeBSD.org using -f
From: iateaca@FreeBSD.org
To: svn-soc-all@FreeBSD.org
Subject: socsvn commit: r286801 -
 soc2015/iateaca/bhyve-ne2000-head/usr.sbin/bhyve
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all/>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 07 Jun 2015 19:53:19 -0000

Author: iateaca
Date: Sun Jun  7 19:53:18 2015
New Revision: 286801
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=286801

Log:
  when update intr take in consideration the IMR register

Modified:
  soc2015/iateaca/bhyve-ne2000-head/usr.sbin/bhyve/pci_ne2000.c

Modified: soc2015/iateaca/bhyve-ne2000-head/usr.sbin/bhyve/pci_ne2000.c
==============================================================================
--- soc2015/iateaca/bhyve-ne2000-head/usr.sbin/bhyve/pci_ne2000.c	Sun Jun  7 18:59:47 2015	(r286800)
+++ soc2015/iateaca/bhyve-ne2000-head/usr.sbin/bhyve/pci_ne2000.c	Sun Jun  7 19:53:18 2015	(r286801)
@@ -152,10 +152,12 @@
 pci_ne2000_update_intr(struct pci_ne2000_softc *sc)
 {
 	uint8_t isr = 0;
+	uint8_t imr = 0;
 
 	isr = ne2000_get_reg_by_offset(sc, NE2000_P0, ED_P0_ISR);
+	imr = ne2000_get_reg_by_offset(sc, NE2000_P0, ED_P0_IMR);
 
-	if (isr) {
+	if (imr & isr) {
 		if (!sc->lintr) {
 			pci_lintr_assert(sc->asc_pi);
 			sc->lintr = 1;