From fb584ab80f80be2103c6dd9bf1cd2f04050aa253 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Mon, 4 Jun 2007 13:25:37 -0700 Subject: [PATCH] --- yaml --- r: 58364 b: refs/heads/master c: a72a8179734393ca351f6ecf8cad6841ab7e1470 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/b44.c | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index b590dcbf4759..3b01ef223a3c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eb034a7998956bffdd2acccb7fddfc114c913120 +refs/heads/master: a72a8179734393ca351f6ecf8cad6841ab7e1470 diff --git a/trunk/drivers/net/b44.c b/trunk/drivers/net/b44.c index 879a2fff474e..e87bab9f9bea 100644 --- a/trunk/drivers/net/b44.c +++ b/trunk/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; }