aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/ipv4/ipconfig.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
index 5bbef4fdcb43..648fa1490ea7 100644
--- a/net/ipv4/ipconfig.c
+++ b/net/ipv4/ipconfig.c
@@ -262,7 +262,8 @@ static int __init ic_open_devs(void)
262 /* wait for a carrier on at least one device */ 262 /* wait for a carrier on at least one device */
263 start = jiffies; 263 start = jiffies;
264 next_msg = start + msecs_to_jiffies(CONF_CARRIER_TIMEOUT/12); 264 next_msg = start + msecs_to_jiffies(CONF_CARRIER_TIMEOUT/12);
265 while (jiffies - start < msecs_to_jiffies(CONF_CARRIER_TIMEOUT)) { 265 while (time_before(jiffies, start +
266 msecs_to_jiffies(CONF_CARRIER_TIMEOUT))) {
266 int wait, elapsed; 267 int wait, elapsed;
267 268
268 for_each_netdev(&init_net, dev) 269 for_each_netdev(&init_net, dev)