From: Alexander Duyck Date: Fri, 26 Aug 2011 07:47:01 +0000 (+0000) Subject: igb: Drop unnecessary write of E1000_IMS from igb_msix_other X-Git-Tag: v2.6.39-400.9.0~423^2~19^2~11^2~262 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=26e068537ff5c5bb29d55ec90a9aec34137ed9c2;p=users%2Fjedix%2Flinux-maple.git igb: Drop unnecessary write of E1000_IMS from igb_msix_other Since we mask interrupts in EIMS not in IMS there is no need to re-enable mask bits in that register. As such we can remove the write to IMS from the end of igb_msix_other. (cherry picked from commit 9ab64ba3c74540cfb8716232834df486bcc6120d) Signed-off-by: Alexander Duyck Tested-by: Aaron Brown Signed-off-by: Jeff Kirsher Signed-off-by: Joe Jin --- diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c index 98a0ec6535ad1..a908133b663e8 100644 --- a/drivers/net/igb/igb_main.c +++ b/drivers/net/igb/igb_main.c @@ -4767,12 +4767,6 @@ static irqreturn_t igb_msix_other(int irq, void *data) mod_timer(&adapter->watchdog_timer, jiffies + 1); } - if (adapter->vfs_allocated_count) - wr32(E1000_IMS, E1000_IMS_LSC | - E1000_IMS_VMMB | - E1000_IMS_DOUTSYNC); - else - wr32(E1000_IMS, E1000_IMS_LSC | E1000_IMS_DOUTSYNC); wr32(E1000_EIMS, adapter->eims_other); return IRQ_HANDLED;