Re: [Kernel-janitors] [PATCH 2.6.9-rc2 28/38] net/pcnet32: replace

[Matthew Wilcox <matthew@wil.cx>]

[-- Attachment #1: Type: text/plain, Size: 1162 bytes --]

On Fri, Sep 24, 2004 at 11:08:25AM -0700, Nishanth Aravamudan wrote:
> Any comments would be appreciated.
> +++ 2.6.9-rc1-mm4/drivers/net/pcnet32.c	2004-09-13 14:38:47.000000000 -0700
> @@ -847,7 +847,7 @@ static int pcnet32_phys_id(struct net_de
>      if ((!data) || (data > (u32)(MAX_SCHEDULE_TIMEOUT / HZ)))
>      data = (u32)(MAX_SCHEDULE_TIMEOUT / HZ);
>  
> -    schedule_timeout(data * HZ);
> +    msleep_interruptible(data * 1000);
>      del_timer_sync(&lp->blink_timer);

Surely that needs to be:

	if ((!data) || (data > (u32)(MAX_SCHEDULE_TIMEOUT / 1000))
		data = (u32)(MAX_SCHEDULE_TIMEOUT / 1000)
	msleep_interruptible(data * 1000);

(and actually, this should be pulled into net/core/ethtool.c out of each
driver).

-- 
"Next the statesmen will invent cheap lies, putting the blame upon 
the nation that is attacked, and every man will be glad of those
conscience-soothing falsities, and will diligently study them, and refuse
to examine any refutations of them; and thus he will by and by convince 
himself that the war is just, and will thank God for the better sleep 
he enjoys after this process of grotesque self-deception." -- Mark Twain

[-- Attachment #2: Type: text/plain, Size: 167 bytes --]

_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors