From: Dmitry Fleytman <dmitry@daynix.com>
Date: Thu, 15 Sep 2016 06:14:28 +0000 (+0300)
Subject: e1000e: Fix OTHER interrupts processing for MSI-X
X-Git-Tag: v2.8.0-rc0~116^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8b54c6e1872825c76200bfb419dadeb6a84b3845;p=thirdparty%2Fqemu.git

e1000e: Fix OTHER interrupts processing for MSI-X

Interrupt mask for legacy OTHER causes should
not apply to MSI-X OTHER cause.

Signed-off-by: Dmitry Fleytman <dmitry@daynix.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---

diff --git a/hw/net/e1000e_core.c b/hw/net/e1000e_core.c
index a5751acd5cb..d26b611ab96 100644
--- a/hw/net/e1000e_core.c
+++ b/hw/net/e1000e_core.c
@@ -2131,7 +2131,7 @@ e1000e_update_interrupt_state(E1000ECore *core)
 
     /* Set ICR[OTHER] for MSI-X */
     if (is_msix) {
-        if (core->mac[ICR] & core->mac[IMS] & E1000_ICR_OTHER_CAUSES) {
+        if (core->mac[ICR] & E1000_ICR_OTHER_CAUSES) {
             core->mac[ICR] |= E1000_ICR_OTHER;
             trace_e1000e_irq_add_msi_other(core->mac[ICR]);
         }