OSDN Git Service

ipconfig: Use time_before
authorHimangi Saraogi <himangi774@gmail.com>
Wed, 20 Aug 2014 17:44:10 +0000 (23:14 +0530)
committerDavid S. Miller <davem@davemloft.net>
Fri, 22 Aug 2014 19:23:11 +0000 (12:23 -0700)
The functions time_before, time_before_eq, time_after, and time_after_eq
are more robust for comparing jiffies against other values.

A simplified version of the Coccinelle semantic patch making this change
is as follows:

@change@
expression E1,E2;
@@
- jiffies - E1 < E2
+ time_before(jiffies, E1+E2)

Signed-off-by: Himangi Saraogi <himangi774@gmail.com>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/ipconfig.c

index 5bbef4f..648fa14 100644 (file)
@@ -262,7 +262,8 @@ static int __init ic_open_devs(void)
        /* wait for a carrier on at least one device */
        start = jiffies;
        next_msg = start + msecs_to_jiffies(CONF_CARRIER_TIMEOUT/12);
-       while (jiffies - start < msecs_to_jiffies(CONF_CARRIER_TIMEOUT)) {
+       while (time_before(jiffies, start +
+                          msecs_to_jiffies(CONF_CARRIER_TIMEOUT))) {
                int wait, elapsed;
 
                for_each_netdev(&init_net, dev)