From: Stephen Hemminger <shemminger@osdl.org>
Date: Mon, 30 Jan 2006 19:37:56 +0000 (-0800)
Subject: [PATCH] sky2: ethtool rx_coalesce settings fix
X-Git-Tag: v2.6.16-rc3~139^2~12
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d28d4870279c5d184804b6ac1775b130972ffecd;p=linux-2.6

[PATCH] sky2: ethtool rx_coalesce settings fix

This fixes setting rx_coalesce_usecs_irq via ethtool in sky2.
The write was directed to the wrong register.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
---

diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index e04c4f40e0..12ff1c857b 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -2847,7 +2847,7 @@ static int sky2_set_coalesce(struct net_device *dev,
 	if (ecmd->rx_coalesce_usecs_irq == 0)
 		sky2_write8(hw, STAT_ISR_TIMER_CTRL, TIM_STOP);
 	else {
-		sky2_write32(hw, STAT_TX_TIMER_INI,
+		sky2_write32(hw, STAT_ISR_TIMER_INI,
 			     sky2_us2clk(hw, ecmd->rx_coalesce_usecs_irq));
 		sky2_write8(hw, STAT_ISR_TIMER_CTRL, TIM_START);
 	}