Auto merge with /home/aegl/GIT/linus

1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/net/wan/sdla_ppp.c b/drivers/net/wan/sdla_ppp.c
index 1761cb68ab48..a4b489cccbbf 100644
--- a/drivers/net/wan/sdla_ppp.c
+++ b/drivers/net/wan/sdla_ppp.c
@@ -101,6 +101,7 @@
 #include <linux/if_arp.h>       /* ARPHRD_* defines */
 #include <asm/byteorder.h>      /* htons(), etc. */
 #include <linux/in.h>           /* sockaddr_in */
+#include <linux/jiffies.h>      /* time_after() macro */
 
 
 #include <asm/uaccess.h>
@@ -482,7 +483,7 @@ static int update(struct wan_device *wandev)
                 if(ppp_priv_area->update_comms_stats == 0){
                         break;
                 }
-                if ((jiffies - timeout) > (1 * HZ)){
+                if (time_after(jiffies, timeout + 1 * HZ)){
                         ppp_priv_area->update_comms_stats = 0;
                         ppp_priv_area->timer_int_enabled &=
                                 ~TMR_INT_ENABLED_UPDATE;