diff options
| author | Himangi Saraogi <himangi774@gmail.com> | 2014-08-20 21:44:10 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-08-22 23:23:11 +0400 |
| commit | c72c95a064e55923c5dd050d099e51ac550f29a2 (patch) | |
| tree | 8b6f1a9b6d913b49266f7b2073b3c8781ef96fd1 /net/ipv4/ipconfig.c | |
| parent | b5c5c36d367c670b9a93b1029d9b3af8610d9535 (diff) | |
| download | linux-c72c95a064e55923c5dd050d099e51ac550f29a2.tar.xz | |
ipconfig: Use time_before
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>
Diffstat (limited to 'net/ipv4/ipconfig.c')
| -rw-r--r-- | net/ipv4/ipconfig.c | 3 |
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) /* 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) |