From 8bf5d0e8356797917c9356f2a1041c1524e72567 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@osdl.org>
Date: Fri, 9 Dec 2005 11:34:59 -0800
Subject: [PATCH] --- yaml --- r: 15792 b: refs/heads/master c:
 129372d0524c9124d5693f63c1d3c1ce2e3714ce h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/net/sky2.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1535bc5dab25..3d8bafe1d700 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f2e46561cc1afa82b18b2fc6efc8510ec57c7d7d
+refs/heads/master: 129372d0524c9124d5693f63c1d3c1ce2e3714ce
diff --git a/trunk/drivers/net/sky2.c b/trunk/drivers/net/sky2.c
index eae270d81808..2dd46a05fb30 100644
--- a/trunk/drivers/net/sky2.c
+++ b/trunk/drivers/net/sky2.c
@@ -1039,7 +1039,7 @@ static int sky2_up(struct net_device *dev)
 /* Modular subtraction in ring */
 static inline int tx_dist(unsigned tail, unsigned head)
 {
-	return (head >= tail ? head : head + TX_RING_SIZE) - tail;
+	return (head - tail) % TX_RING_SIZE;
 }
 
 /* Number of list elements available for next tx */