Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 58364
b: refs/heads/master
c: a72a817
h: refs/heads/master
v: v3
  • Loading branch information
Stephen Hemminger authored and Jeff Garzik committed Jul 9, 2007
1 parent d1bb730 commit fb584ab
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: eb034a7998956bffdd2acccb7fddfc114c913120
refs/heads/master: a72a8179734393ca351f6ecf8cad6841ab7e1470
9 changes: 4 additions & 5 deletions trunk/drivers/net/b44.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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;
}

Expand Down

0 comments on commit fb584ab

Please sign in to comment.