From bb54b1efe1f1dc985271861aeca629c98debb96d Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@linux-foundation.org>
Date: Mon, 9 Jul 2007 15:33:41 -0700
Subject: [PATCH] --- yaml --- r: 58725 b: refs/heads/master c:
 f957da2aa0b7ef9659a45b0895ec4a08602b1c15 h: refs/heads/master i:   58723:
 1862e1c1b6c8996ed0a1dd629729b1cc82fbe537 v: v3

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

diff --git a/[refs] b/[refs]
index ee2f573eec32..986a29e30701 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 71749531f2d1954137a1a77422ef4ff29eb102dd
+refs/heads/master: f957da2aa0b7ef9659a45b0895ec4a08602b1c15
diff --git a/trunk/drivers/net/sky2.c b/trunk/drivers/net/sky2.c
index 4e0b839de7e4..8cc3eea727a8 100644
--- a/trunk/drivers/net/sky2.c
+++ b/trunk/drivers/net/sky2.c
@@ -1180,8 +1180,7 @@ static int sky2_rx_start(struct sky2_port *sky2)
 	rx_set_checksum(sky2);
 
 	/* Space needed for frame data + headers rounded up */
-	size = ALIGN(sky2->netdev->mtu + ETH_HLEN + VLAN_HLEN, 8)
-		+ 8;
+	size = roundup(sky2->netdev->mtu + ETH_HLEN + VLAN_HLEN, 8);
 
 	/* Stopping point for hardware truncation */
 	thresh = (size - 8) / sizeof(u32);