netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: dmitry.krivoschekov@gmail.com
To: netdev@vger.kernel.org, davem@davemloft.net
Cc: Dmitry Krivoschekov <dkrivoschekov@ru.mvista.com>
Subject: [PATCH 1/3] ipconfig: use same time units for CONF_{PRE,POST}_OPEN delays
Date: Thu, 16 Apr 2009 13:37:37 +0400	[thread overview]
Message-ID: <1239874659-19273-2-git-send-email-dmitry.krivoschekov@gmail.com> (raw)
In-Reply-To: <1239874659-19273-1-git-send-email-dmitry.krivoschekov@gmail.com>

From: Dmitry Krivoschekov <dkrivoschekov@ru.mvista.com>

It's confusing that the delay before opening is measured in msecs
while after opening the delay is in seconds. Lets use the same
time units for both.

Signed-off-by: Dmitry Krivoschekov <dkrivoschekov@ru.mvista.com>
---
 net/ipv4/ipconfig.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
index da134aa..4c6e38f 100644
--- a/net/ipv4/ipconfig.c
+++ b/net/ipv4/ipconfig.c
@@ -87,7 +87,7 @@
 
 /* Define the friendly delay before and after opening net devices */
 #define CONF_PRE_OPEN		500	/* Before opening: 1/2 second */
-#define CONF_POST_OPEN		1	/* After opening: 1 second */
+#define CONF_POST_OPEN		1000	/* After opening: 1 second */
 
 /* Define the timeout for waiting for a DHCP/BOOTP/RARP reply */
 #define CONF_OPEN_RETRIES 	2	/* (Re)open devices twice */
@@ -1291,7 +1291,7 @@ static int __init ip_auto_config(void)
 		return -1;
 
 	/* Give drivers a chance to settle */
-	ssleep(CONF_POST_OPEN);
+	msleep(CONF_POST_OPEN);
 
 	/*
 	 * If the config information is insufficient (e.g., our IP address or
-- 
1.6.1.2.MVISTA.5.ga9f3b


  reply	other threads:[~2009-04-16  9:36 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-04-16  9:37 [PATCH 0/3] dmitry.krivoschekov
2009-04-16  9:37 ` dmitry.krivoschekov [this message]
2009-04-16  9:37 ` [PATCH 2/3] ipconfig: add 'ipwait' cmdline parameter dmitry.krivoschekov
2009-04-16  9:37 ` [PATCH 3/3] ipconfig: look for a network device forever if NFS root dmitry.krivoschekov
2009-04-17  8:23 ` [PATCH 0/3] David Miller
2009-04-17 10:00   ` [PATCH 0/3] ipconfig tweaks Dmitry Krivoschekov
2009-04-17 10:45     ` David Miller
2009-04-17 14:31     ` Benny Amorsen

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=1239874659-19273-2-git-send-email-dmitry.krivoschekov@gmail.com \
    --to=dmitry.krivoschekov@gmail.com \
    --cc=davem@davemloft.net \
    --cc=dkrivoschekov@ru.mvista.com \
    --cc=netdev@vger.kernel.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).