From owner-svn-src-all@freebsd.org  Mon Jun 19 15:03:49 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3297DD9E855;
 Mon, 19 Jun 2017 15:03:49 +0000 (UTC)
 (envelope-from sbruno@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (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 EC436776D9;
 Mon, 19 Jun 2017 15:03:48 +0000 (UTC)
 (envelope-from sbruno@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v5JF3mVS091179;
 Mon, 19 Jun 2017 15:03:48 GMT (envelope-from sbruno@FreeBSD.org)
Received: (from sbruno@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v5JF3lNp091178;
 Mon, 19 Jun 2017 15:03:47 GMT (envelope-from sbruno@FreeBSD.org)
Message-Id: <201706191503.v5JF3lNp091178@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: sbruno set sender to
 sbruno@FreeBSD.org using -f
From: Sean Bruno <sbruno@FreeBSD.org>
Date: Mon, 19 Jun 2017 15:03:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r320102 - stable/11/sys/dev/e1000
X-SVN-Group: stable-11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
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: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 19 Jun 2017 15:03:49 -0000

Author: sbruno
Date: Mon Jun 19 15:03:47 2017
New Revision: 320102
URL: https://svnweb.freebsd.org/changeset/base/320102

Log:
  Direct commit to stable/11 to correctly setting the EIAC and IMS
  registers to the same values when processing interrupts.  This reverts a
  change made in r286831 that was not fully reverted in r311979
  
  This resolves PR https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=211219
  
  PR:		211219
  Submitted by:	Franco Fitchner <franco@opnsense.org>
  Approved by:	re (marius)

Modified:
  stable/11/sys/dev/e1000/if_em.c

Modified: stable/11/sys/dev/e1000/if_em.c
==============================================================================
--- stable/11/sys/dev/e1000/if_em.c	Mon Jun 19 15:00:06 2017	(r320101)
+++ stable/11/sys/dev/e1000/if_em.c	Mon Jun 19 15:03:47 2017	(r320102)
@@ -5115,7 +5115,7 @@ em_enable_intr(struct adapter *adapter)
 
 	if (hw->mac.type == e1000_82574) {
 		E1000_WRITE_REG(hw, EM_EIAC, EM_MSIX_MASK);
-		ims_mask |= adapter->ims;
+		ims_mask |= EM_MSIX_MASK;
 	} 
 	E1000_WRITE_REG(hw, E1000_IMS, ims_mask);
 }