diff --git a/[refs] b/[refs] index 24dd6f16ecc3..4dbfcedd08b4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9a799d71034c4e2b168740c8a8530591011313d5 +refs/heads/master: 34c6417b7087a4818e7dca2e5d66c3361cee80a1 diff --git a/trunk/drivers/net/e100.c b/trunk/drivers/net/e100.c index e25f5ec2b279..10907f158bac 100644 --- a/trunk/drivers/net/e100.c +++ b/trunk/drivers/net/e100.c @@ -1605,7 +1605,8 @@ static void e100_watchdog(unsigned long data) else nic->flags &= ~ich_10h_workaround; - mod_timer(&nic->watchdog, jiffies + E100_WATCHDOG_PERIOD); + mod_timer(&nic->watchdog, + round_jiffies(jiffies + E100_WATCHDOG_PERIOD)); } static void e100_xmit_prepare(struct nic *nic, struct cb *cb,