From: Al Viro <viro@ftp.linux.org.uk>
Date: Sun, 16 Mar 2008 22:22:14 +0000 (+0000)
Subject: ipg fix
X-Git-Tag: v2.6.25-rc7~54^2~37
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=48f5fec5486286103c4423fc78fdf3a15530c3b9;p=linux-2.6

ipg fix

spurious cpu_to_le64()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
---

diff --git a/drivers/net/ipg.c b/drivers/net/ipg.c
index 5e5d9b527e..2fdbde772e 100644
--- a/drivers/net/ipg.c
+++ b/drivers/net/ipg.c
@@ -1900,8 +1900,13 @@ static int ipg_nic_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
 	/* Specify the TFC field within the TFD. */
 	txfd->tfc |= cpu_to_le64(IPG_TFC_WORDALIGNDISABLED |
-		(IPG_TFC_FRAMEID & cpu_to_le64(sp->tx_current)) |
+		(IPG_TFC_FRAMEID & sp->tx_current) |
 		(IPG_TFC_FRAGCOUNT & (1 << 24)));
+	/*
+	 * 16--17 (WordAlign) <- 3 (disable),
+	 * 0--15 (FrameId) <- sp->tx_current,
+	 * 24--27 (FragCount) <- 1
+	 */
 
 	/* Request TxComplete interrupts at an interval defined
 	 * by the constant IPG_FRAMESBETWEENTXCOMPLETES.