From: Nishanth Aravamudan <nacc@us.ibm.com>
To: davem@davemloft.net, kuznet@ms2.inr.ac.ru, jmorris@redhat.com,
yoshfuji@linux-ipv6.org, kaber@coreworks.de
Cc: netdev@oss.sgi.com, kernel-janitors@lists.osdl.org
Subject: [KJ] [PATCH 21/39] net/ipconfig: replace schedule_timeout() with msleep()
Date: Thu, 20 Jan 2005 15:57:49 -0800 [thread overview]
Message-ID: <20050120235749.GJ2600@us.ibm.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 1609 bytes --]
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.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
--- 2.6.11-rc1-kj-v/net/ipv4/ipconfig.c 2005-01-15 16:55:44.000000000 -0800
+++ 2.6.11-rc1-kj/net/ipv4/ipconfig.c 2005-01-18 13:01:44.000000000 -0800
@@ -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
[-- 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
next reply other threads:[~2005-01-20 23:57 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-01-20 23:57 Nishanth Aravamudan [this message]
2005-01-21 2:36 ` [KJ] Re: [PATCH 21/39] net/ipconfig: replace schedule_timeout() with msleep() James Morris
2005-02-09 4:37 ` David S. Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20050120235749.GJ2600@us.ibm.com \
--to=nacc@us.ibm.com \
--cc=davem@davemloft.net \
--cc=jmorris@redhat.com \
--cc=kaber@coreworks.de \
--cc=kernel-janitors@lists.osdl.org \
--cc=kuznet@ms2.inr.ac.ru \
--cc=netdev@oss.sgi.com \
--cc=yoshfuji@linux-ipv6.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).