Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a3c6433 authored by Alexander Duyck's avatar Alexander Duyck Committed by David S. Miller
Browse files

igb: don't read eicr when responding to legacy interrupts 



The interrupt handler was reading eicr and then doing nothing with the
result.  I have removed the variable and the register read since they
provide no value to the legacy interrupt handler.

Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 28b0759c

drivers/net/igb/igb_main.c

+1 −4
Original line number Diff line number Diff line
@@ -3519,7 +3519,7 @@ static irqreturn_t igb_intr_msi(int irq, void *data) 
}



/**

 * igb_intr - Interrupt Handler

 * igb_intr - Legacy Interrupt Handler

 * @irq: interrupt number

 * @data: pointer to a network interface device structure

 **/
@@ -3531,7 +3531,6 @@ static irqreturn_t igb_intr(int irq, void *data) 
	/* Interrupt Auto-Mask...upon reading ICR, interrupts are masked.  No

	 * need for the IMC write */

	u32 icr = rd32(E1000_ICR);

	u32 eicr = 0;

	if (!icr)

		return IRQ_NONE;  /* Not our interrupt */
@@ -3547,8 +3546,6 @@ static irqreturn_t igb_intr(int irq, void *data) 
		adapter->stats.doosync++;

	}



	eicr = rd32(E1000_EICR);



	if (icr & (E1000_ICR_RXSEQ | E1000_ICR_LSC)) {

		hw->mac.get_link_status = 1;

		/* guard against interrupt when we're going down */