---

yaml --- r: 134342 b: refs/heads/master c: 4a3c643 h: refs/heads/master v: v3
git-mirror · Feb 7, 2009 · ca52b2c · ca52b2c
1 parent 1d0023d
commit ca52b2c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 28b0759c224cad4ae8f5ed47f5af862dd2d1e1ed
+refs/heads/master: 4a3c6433e48592f260278966742a99e0d77de3cc
diff --git a/trunk/drivers/net/igb/igb_main.c b/trunk/drivers/net/igb/igb_main.c
@@ -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 */