---

yaml --- r: 175147 b: refs/heads/master c: ceef1a5 h: refs/heads/master i: 175145: 66dbde2 175143: 861db03 v: v3
git-mirror · Dec 11, 2009 · 40c2f2e · 40c2f2e
1 parent 27d6627
commit 40c2f2e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1458d82b459198b16805eca54877ef16204cd33c
+refs/heads/master: ceef1a5e0ebc3418c8dbd8644195cce3bcb6949f
diff --git a/trunk/drivers/staging/et131x/et1310_tx.h b/trunk/drivers/staging/et131x/et1310_tx.h
@@ -143,9 +143,7 @@ struct tx_ring {
 	u32 *tx_status;
 	dma_addr_t tx_status_pa;
 
-	TXMAC_ERR_t TxMacErr;
-
-	/* Variables to track the Tx interrupt coalescing features */
+	/* Packets since the last IRQ: used for interrupt coalescing */
 	int since_irq;
 };
 

diff --git a/trunk/drivers/staging/et131x/et131x_isr.c b/trunk/drivers/staging/et131x/et131x_isr.c
@@ -397,8 +397,7 @@ void et131x_isr_handler(struct work_struct *work)
 
 		/* Let's move on to the TxMac */
 		if (status & ET_INTR_TXMAC) {
-			etdev->tx_ring.TxMacErr.value =
-				readl(&iomem->txmac.err.value);
+			u32 err = readl(&iomem->txmac.err.value);
 
 			/*
 			 * When any of the errors occur and TXMAC generates
@@ -412,7 +411,7 @@ void et131x_isr_handler(struct work_struct *work)
 			 */
 			dev_warn(&etdev->pdev->dev,
 				    "TXMAC interrupt, error 0x%08x\n",
-				    etdev->tx_ring.TxMacErr.value);
+				    err);
 
 			/* If we are debugging, we want to see this error,
 			 * otherwise we just want the device to be reset and