svn commit: r320102 - stable/11/sys/dev/e1000

[Sean Bruno]

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 at 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);
 }