summaryrefslogtreecommitdiff
path: root/drivers/net/b44.c
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@linux-foundation.org>2007-06-04 13:25:37 -0700
committerJeff Garzik <jeff@garzik.org>2007-07-08 22:16:39 -0400
commita72a8179734393ca351f6ecf8cad6841ab7e1470 (patch)
tree774abed2532e59a3e986ee666f92357ba75608a9 /drivers/net/b44.c
parenteb034a7998956bffdd2acccb7fddfc114c913120 (diff)
b44: timer power saving
Make the PHY and statistic timer run on one second boundary for powersaving. On resume, the driver should check for link up immediately, to get online faster (rather than waiting for the next second). Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/b44.c')
-rw-r--r--drivers/net/b44.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/b44.c b/drivers/net/b44.c
index 879a2fff474e..e87bab9f9bea 100644
--- a/drivers/net/b44.c
+++ b/drivers/net/b44.c
@@ -599,8 +599,7 @@ static void b44_timer(unsigned long __opaque)
spin_unlock_irq(&bp->lock);
- bp->timer.expires = jiffies + HZ;
- add_timer(&bp->timer);
+ mod_timer(&bp->timer, round_jiffies(jiffies + HZ));
}
static void b44_tx(struct b44 *bp)
@@ -2348,11 +2347,11 @@ static int b44_resume(struct pci_dev *pdev)
netif_device_attach(bp->dev);
spin_unlock_irq(&bp->lock);
- bp->timer.expires = jiffies + HZ;
- add_timer(&bp->timer);
-
b44_enable_ints(bp);
netif_wake_queue(dev);
+
+ mod_timer(&bp->timer, jiffies + 1);
+
return 0;
}