summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Poirier <bpoirier@suse.com>2015-11-09 15:50:18 -0800
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2015-12-14 19:30:21 -0800
commit4d432f67ff004dc387ba307d418d0eae4fa9dc13 (patch)
tree44ed3d45f2b8d15e17fbfdcee09b5d46b530d9bf
parentd602de05934c1d3022b153ff879e81f65df2a7b6 (diff)
downloadop-kernel-dev-4d432f67ff004dc387ba307d418d0eae4fa9dc13.zip
op-kernel-dev-4d432f67ff004dc387ba307d418d0eae4fa9dc13.tar.gz
e1000e: Remove unreachable code
msi-x interrupts are not shared so there's no need to check if the interrupt was really from this adapter. Signed-off-by: Benjamin Poirier <bpoirier@suse.com> Tested-by: Aaron Brown <aaron.f.brown@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
-rw-r--r--drivers/net/ethernet/intel/e1000e/netdev.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index 955c8c7..26cf183 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -1907,12 +1907,6 @@ static irqreturn_t e1000_msix_other(int __always_unused irq, void *data)
struct e1000_hw *hw = &adapter->hw;
u32 icr = er32(ICR);
- if (!(icr & E1000_ICR_INT_ASSERTED)) {
- if (!test_bit(__E1000_DOWN, &adapter->state))
- ew32(IMS, E1000_IMS_OTHER);
- return IRQ_NONE;
- }
-
if (icr & adapter->eiac_mask)
ew32(ICS, (icr & adapter->eiac_mask));
OpenPOWER on IntegriCloud