From 047ffc7c519c97b267991ba8b334331a1bf4d70c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Ha=C5=82asa?= <khc@pm.waw.pl>
Date: Wed, 9 Jul 2008 23:39:12 +0200
Subject: [PATCH] --- yaml --- r: 122091 b: refs/heads/master c:
 0b59cef885f7d451acad02f70c9712f1ef3638b1 h: refs/heads/master i:   122089:
 71aea89b70444f6f793438b502411bda2f9df625   122087:
 89c85b650af2bb61f083af2d4ab68525f29a084c v: v3

---
 [refs]                          |  2 +-
 trunk/drivers/net/wan/hd64572.c | 13 +++----------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 3fa61237eb3a..b03c3f6e558f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 61e0a6a268947f7385282c6841f3e3d64b4c5cb9
+refs/heads/master: 0b59cef885f7d451acad02f70c9712f1ef3638b1
diff --git a/trunk/drivers/net/wan/hd64572.c b/trunk/drivers/net/wan/hd64572.c
index c7eff0a66a8e..6a6fe6a7c44b 100644
--- a/trunk/drivers/net/wan/hd64572.c
+++ b/trunk/drivers/net/wan/hd64572.c
@@ -78,13 +78,6 @@ static inline void disable_intr(port_t *port)
 		 (port->chan ? 0x00FF00FF : 0xFF00FF00), IER0, port->card);
 }
 
-static inline u16 next_desc(port_t *port, u16 desc, int transmit)
-{
-	return (desc + 1) % (transmit ? port->card->tx_ring_buffers
-			     : port->card->rx_ring_buffers);
-}
-
-
 static inline u16 desc_abs_number(port_t *port, u16 desc, int transmit)
 {
 	u16 rx_buffs = port->card->rx_ring_buffers;
@@ -291,7 +284,7 @@ static inline int sca_rx_done(port_t *port, int budget)
 
 		/* Set new error descriptor address */
 		sca_outl(desc_off, dmac + EDAL, card);
-		port->rxin = next_desc(port, port->rxin, 0);
+		port->rxin = (port->rxin + 1) % card->rx_ring_buffers;
 	}
 
 	/* make sure RX DMA is enabled */
@@ -329,7 +322,7 @@ static inline void sca_tx_done(port_t *port)
 			dev->stats.tx_bytes += readw(&desc->len);
 		}
 		writeb(0, &desc->stat);	/* Free descriptor */
-		port->txlast = next_desc(port, port->txlast, 1);
+		port->txlast = (port->txlast + 1) % card->tx_ring_buffers;
 	}
 
 	netif_wake_queue(dev);
@@ -599,7 +592,7 @@ static int sca_xmit(struct sk_buff *skb, struct net_device *dev)
 	writeb(ST_TX_EOM, &desc->stat);
 	dev->trans_start = jiffies;
 
-	port->txin = next_desc(port, port->txin, 1);
+	port->txin = (port->txin + 1) % card->tx_ring_buffers;
 	sca_outl(desc_offset(port, port->txin, 1),
 		 get_dmac_tx(port) + EDAL, card);