diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-07-25 15:46:44 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-07-25 15:46:44 -0700 |
| commit | 05cb784c81a0fd1f97732156ea464bd392ce875a (patch) | |
| tree | 24122979b411dcec6ff390fc9ae84ad9413128e9 /drivers/net/wan/sdla_x25.c | |
| parent | 3190186362466658f01b2e354e639378ce07e1a9 (diff) | |
| parent | 6b6a93c6876ea1c530d5d3f68e3678093a27fab0 (diff) | |
| download | kernel_goldelico_gta04-05cb784c81a0fd1f97732156ea464bd392ce875a.zip kernel_goldelico_gta04-05cb784c81a0fd1f97732156ea464bd392ce875a.tar.gz kernel_goldelico_gta04-05cb784c81a0fd1f97732156ea464bd392ce875a.tar.bz2 | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'drivers/net/wan/sdla_x25.c')
| -rw-r--r-- | drivers/net/wan/sdla_x25.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wan/sdla_x25.c b/drivers/net/wan/sdla_x25.c index 3a93d2f..8a95d61 100644 --- a/drivers/net/wan/sdla_x25.c +++ b/drivers/net/wan/sdla_x25.c @@ -91,6 +91,7 @@ #include <linux/wanrouter.h> /* WAN router definitions */ #include <linux/wanpipe.h> /* WANPIPE common user API definitions */ #include <linux/workqueue.h> +#include <linux/jiffies.h> /* time_after() macro */ #include <asm/byteorder.h> /* htons(), etc. */ #include <asm/atomic.h> #include <linux/delay.h> /* Experimental delay */ @@ -867,7 +868,7 @@ static int update(struct wan_device* wandev) if (!(card->u.x.timer_int_enabled & TMR_INT_ENABLED_UPDATE)){ break; } - if ((jiffies-timeout) > 1*HZ){ + if (time_after(jiffies, timeout + 1*HZ)){ card->u.x.timer_int_enabled &= ~TMR_INT_ENABLED_UPDATE; return -EAGAIN; } |