[PATCH] fealnx #3: fix pointer substraction bug

ad5373ea · Denis Vlasenko · Linus Torvalds · 6a37b3e6 · ad5373ea
Commit ad5373ea authored Apr 21, 2004 by Denis Vlasenko Committed by Linus Torvalds Apr 21, 2004
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 5 deletions

drivers/net/fealnx.c drivers/net/fealnx.c +5 -5

No files found.
--- a/drivers/net/fealnx.c
+++ b/drivers/net/fealnx.c
@@ -1228,10 +1228,10 @@ static void tx_timeout(struct net_device *dev)
 		rmb();
 	}
-	writel((np->cur_tx - np->tx_ring)*sizeof(struct fealnx_desc) +
+	writel(np->tx_ring_dma + ((char*)np->cur_tx - (char*)np->tx_ring),
-		np->tx_ring_dma, ioaddr + TXLBA);
+		ioaddr + TXLBA);
-	writel((np->cur_rx - np->rx_ring)*sizeof(struct fealnx_desc) +
+	writel(np->rx_ring_dma + ((char*)np->cur_rx - (char*)np->rx_ring),
-		np->rx_ring_dma, ioaddr + RXLBA);
+		ioaddr + RXLBA);
 	writel(np->bcrvalue, ioaddr + BCR);
@@ -1415,7 +1415,7 @@ static void reset_rx_descriptors(struct net_device *dev)
 	allocate_rx_buffers(dev);
-	writel(np->rx_ring_dma + (np->cur_rx - np->rx_ring),
+	writel(np->rx_ring_dma + ((char*)np->cur_rx - (char*)np->rx_ring),
 		dev->base_addr + RXLBA);
 	writel(np->crvalue, dev->base_addr + TCRRCR);
 }