From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Hemminger Subject: Re: [PATCH] pcnet32: round off carrier watch timer Date: Wed, 7 Jan 2009 16:38:19 -0800 Message-ID: <20090107163819.3ef02507@extreme> References: <20090107121036.4e16b7cf@extreme> <496549AF.3050500@cn.fujitsu.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: David Miller , netdev@vger.kernel.org To: Wang Chen Return-path: Received: from mail.vyatta.com ([76.74.103.46]:37044 "EHLO mail.vyatta.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756887AbZAHAiV (ORCPT ); Wed, 7 Jan 2009 19:38:21 -0500 In-Reply-To: <496549AF.3050500@cn.fujitsu.com> Sender: netdev-owner@vger.kernel.org List-ID: On Thu, 08 Jan 2009 08:32:47 +0800 Wang Chen wrote: > Stephen Hemminger said the following on 2009-1-8 4:10: > > The link check watchdog timer on this driver fires every two seconds, but > > since not aligned it causes extra wakeups. It is more important on this > > driver than most because it is the hardware that is emulated by default > > when using network interfaces on VMware. > > > > Signed-off-by: Stephen Hemminger > > > > --- a/drivers/net/pcnet32.c 2009-01-07 12:05:54.218712996 -0800 > > +++ b/drivers/net/pcnet32.c 2009-01-07 12:06:37.430288101 -0800 > > @@ -2282,7 +2282,7 @@ static int pcnet32_open(struct net_devic > > 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); > > should be > + mod_timer(&lp->watchdog_timer, round_jiffies(PCNET32_WATCHDOG_TIMEOUT)); > same as that in pcnet32_watchdog()? It only gets run on the first tick so it doesn't matter.