aboutsummaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2008-03-16 22:22:14 +0000
committerJeff Garzik <jeff@garzik.org>2008-03-17 07:56:36 -0400
commit48f5fec5486286103c4423fc78fdf3a15530c3b9 (patch)
treec2ee781ff718a4cf946dd9093d6285c37f94c772 /drivers/net
parent3b5e26f7b07f5e537cef705de79174025ecd383c (diff)
ipg fix
spurious cpu_to_le64() Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ipg.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/net/ipg.c b/drivers/net/ipg.c
index 5e5d9b527ed..2fdbde772e9 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.