Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git...

[deliverable/linux.git] / net / decnet / dn_timer.c

diff --git a/net/decnet/dn_timer.c b/net/decnet/dn_timer.c
index d9c150cc59a952ac86585b6c600acc398b80bc14..1d330fd43dc7e177d162f77796d2142a4e563fdb 100644 (file)
--- a/net/decnet/dn_timer.c
+++ b/net/decnet/dn_timer.c
@@ -23,6 +23,7 @@
 #include <linux/spinlock.h>
 #include <net/sock.h>
 #include <linux/atomic.h>
+#include <linux/jiffies.h>
 #include <net/flow.h>
 #include <net/dn.h>
 
@@ -91,7 +92,7 @@ static void dn_slow_timer(unsigned long arg)
         * since the last successful transmission.
         */
        if (scp->keepalive && scp->keepalive_fxn && (scp->state == DN_RUN)) {
-               if ((jiffies - scp->stamp) >= scp->keepalive)
+               if (time_after_eq(jiffies, scp->stamp + scp->keepalive))
                        scp->keepalive_fxn(sk);
        }