From cb1f4e50537512e8cd5d624dfae77c550cd4e142 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Mon, 30 Jan 2006 11:37:56 -0800 Subject: [PATCH] --- yaml --- r: 19863 b: refs/heads/master c: d28d4870279c5d184804b6ac1775b130972ffecd h: refs/heads/master i: 19861: 560d2460cc82c528f3173e498afd748aa1e40d8d 19859: 1b325d62039b89d5953eb57da240f0f5233d57d5 19855: 11f5b4082f30a69af1b235b874fd7f97d0120605 v: v3 --- [refs] | 2 +- trunk/drivers/net/sky2.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1dd3d4569e0e..65eb41884224 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2d42d21f11c20b94ea0222637e20e2630845afe4 +refs/heads/master: d28d4870279c5d184804b6ac1775b130972ffecd diff --git a/trunk/drivers/net/sky2.c b/trunk/drivers/net/sky2.c index e04c4f40e0bb..12ff1c857bf9 100644 --- a/trunk/drivers/net/sky2.c +++ b/trunk/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); }