net/ipconfig: replace schedule_timeout() with msleep()
Subsystems (4)
PATCH 21/39 net/ipconfig: replace schedule_timeout() with msleep()
Hi,
Please consider applying.
Description: Use msleep() instead of schedule_timeout() to guarantee the task delays as expected. Change the units of the two constants to be msecs and secs respectively.
net/ipv4/ipconfig.c +5 -6
@@ -53,6 +53,7 @@#include <linux/seq_file.h> #include <linux/major.h> #include <linux/root_dev.h> +#include <linux/delay.h> #include <net/arp.h> #include <net/ip.h> #include <net/ipconfig.h>
@@ -84,8 +85,8 @@#endif /* Define the friendly delay before and after opening net devices */ -#define CONF_PRE_OPEN (HZ/2)/* Before opening: 1/2 second */ -#define CONF_POST_OPEN (1*HZ)/* After opening: 1 second */ +#define CONF_PRE_OPEN 500/* Before opening: 1/2 second */ +#define CONF_POST_OPEN 1/* After opening: 1 second */ /* Define the timeout for waiting for a DHCP/BOOTP/RARP reply */ #define CONF_OPEN_RETRIES 2/* (Re)open devices twice */
@@ -1259,16 +1260,14 @@ static int __init ip_auto_config(void) try_try_again:#endif /* Give hardware a chance to settle */ -set_current_state (TASK_UNINTERRUPTIBLE ); -schedule_timeout (CONF_PRE_OPEN ); +msleep (CONF_PRE_OPEN );/* Setup all network devices */ if (ic_open_devs () <0 )return -1 ;/* Give drivers a chance to settle */ -set_current_state (TASK_UNINTERRUPTIBLE ); -schedule_timeout (CONF_POST_OPEN ); +ssleep (CONF_POST_OPEN );/* * If the config information is insufficient (e.g., our IP address or
_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors
Quoted 7 lines · Nishanth Aravamudan
Hi,
Please consider applying.
Description: Use
msleep()instead ofschedule_timeout()to guarantee the task delays as expected. Change the units of the two constants to be msecs and secs respectively.
Looks fine to me.
- James
Signature · 2 lines
James Morris <[email protected]>
_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors
David S. Miller
maintainerQuoted 11 lines · On Thu, 20 Jan 2005 21:36:42 -0500 (EST) James Morris <[email protected]>…
Quoted 7 lines · Nishanth Aravamudan
Hi,
Please consider applying.
Description: Use
msleep()instead ofschedule_timeout()to guarantee the task delays as expected. Change the units of the two constants to be msecs and secs respectively.Looks fine to me.
To me too, applied. Thanks Nishanth.
_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors