From 22575bbe90ea8e07b8711eaa505dd7a7cada907a Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Thu, 8 Jan 2009 11:17:13 -0800 Subject: [PATCH] --- yaml --- r: 127842 b: refs/heads/master c: 283a21d3e16e9709012cc8b0839ec474d8888a5d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/pcnet32.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3f27c6b0b4d2..6bad7e77b1f4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9fd7a1d92b4462acaa460bb0f58b12ede6ffe6b9 +refs/heads/master: 283a21d3e16e9709012cc8b0839ec474d8888a5d diff --git a/trunk/drivers/net/pcnet32.c b/trunk/drivers/net/pcnet32.c index c1bef953bf07..665a4286da39 100644 --- a/trunk/drivers/net/pcnet32.c +++ b/trunk/drivers/net/pcnet32.c @@ -2282,7 +2282,7 @@ static int pcnet32_open(struct net_device *dev) if (lp->chip_version >= PCNET32_79C970A) { /* Print the link status and start the watchdog */ pcnet32_check_media(dev, 1); - mod_timer(&(lp->watchdog_timer), PCNET32_WATCHDOG_TIMEOUT); + mod_timer(&lp->watchdog_timer, PCNET32_WATCHDOG_TIMEOUT); } i = 0; @@ -2917,7 +2917,7 @@ static void pcnet32_watchdog(struct net_device *dev) pcnet32_check_media(dev, 0); spin_unlock_irqrestore(&lp->lock, flags); - mod_timer(&(lp->watchdog_timer), PCNET32_WATCHDOG_TIMEOUT); + mod_timer(&lp->watchdog_timer, round_jiffies(PCNET32_WATCHDOG_TIMEOUT)); } static int pcnet32_pm_suspend(struct pci_dev *pdev, pm_message_t state)