diff options
| author | sbruno <sbruno@FreeBSD.org> | 2017-06-19 15:03:47 +0000 |
|---|---|---|
| committer | sbruno <sbruno@FreeBSD.org> | 2017-06-19 15:03:47 +0000 |
| commit | 5069a7986d5c3dc517d4a5b5eaa0c15207bf71c7 (patch) | |
| tree | a4b857164d4948f145aa5ed6f46b81ae5d97e678 /sys | |
| parent | 432e857f0d18498c906d69775e49df383fc97973 (diff) | |
| download | FreeBSD-src-5069a7986d5c3dc517d4a5b5eaa0c15207bf71c7.zip FreeBSD-src-5069a7986d5c3dc517d4a5b5eaa0c15207bf71c7.tar.gz | |
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)
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/e1000/if_em.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index da26579..887af7c 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -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); } |
