summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel/igb/igb_main.c
diff options
context:
space:
mode:
authorAlexander Duyck2011-08-26 09:47:01 +0200
committerJeff Kirsher2011-10-13 07:46:30 +0200
commit9ab64ba3c74540cfb8716232834df486bcc6120d (patch)
tree70049a5db9ee83bb3b732e3a7258afa1c729da8b /drivers/net/ethernet/intel/igb/igb_main.c
parentigb: Fix features that are currently 82580 only and should also be i350 (diff)
downloadkernel-qcow2-linux-9ab64ba3c74540cfb8716232834df486bcc6120d.tar.gz
kernel-qcow2-linux-9ab64ba3c74540cfb8716232834df486bcc6120d.tar.xz
kernel-qcow2-linux-9ab64ba3c74540cfb8716232834df486bcc6120d.zip
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. Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com> Tested-by: Aaron Brown <aaron.f.brown@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/igb/igb_main.c')
-rw-r--r--drivers/net/ethernet/intel/igb/igb_main.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index fee771b4d332..9e7930686cd0 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -4766,12 +4766,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;