diff options
Diffstat (limited to 'drivers/atm')
-rw-r--r-- | drivers/atm/iphase.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c index 670c093ed25f..5c28ca7380ff 100644 --- a/drivers/atm/iphase.c +++ b/drivers/atm/iphase.c | |||
@@ -60,7 +60,8 @@ | |||
60 | #include <asm/uaccess.h> | 60 | #include <asm/uaccess.h> |
61 | #include <asm/string.h> | 61 | #include <asm/string.h> |
62 | #include <asm/byteorder.h> | 62 | #include <asm/byteorder.h> |
63 | #include <linux/vmalloc.h> | 63 | #include <linux/vmalloc.h> |
64 | #include <linux/jiffies.h> | ||
64 | #include "iphase.h" | 65 | #include "iphase.h" |
65 | #include "suni.h" | 66 | #include "suni.h" |
66 | #define swap(x) (((x & 0xff) << 8) | ((x & 0xff00) >> 8)) | 67 | #define swap(x) (((x & 0xff) << 8) | ((x & 0xff00) >> 8)) |
@@ -189,7 +190,7 @@ static u16 get_desc (IADEV *dev, struct ia_vcc *iavcc) { | |||
189 | int ltimeout; | 190 | int ltimeout; |
190 | 191 | ||
191 | ia_hack_tcq (dev); | 192 | ia_hack_tcq (dev); |
192 | if(((jiffies - timer)>50)||((dev->ffL.tcq_rd==dev->host_tcq_wr))){ | 193 | if((time_after(jiffies,timer+50)) || ((dev->ffL.tcq_rd==dev->host_tcq_wr))) { |
193 | timer = jiffies; | 194 | timer = jiffies; |
194 | i=0; | 195 | i=0; |
195 | while (i < dev->num_tx_desc) { | 196 | while (i < dev->num_tx_desc) { |
@@ -1225,7 +1226,7 @@ static void rx_intr(struct atm_dev *dev) | |||
1225 | iadev->rx_tmp_jif = jiffies; | 1226 | iadev->rx_tmp_jif = jiffies; |
1226 | iadev->rxing = 0; | 1227 | iadev->rxing = 0; |
1227 | } | 1228 | } |
1228 | else if (((jiffies - iadev->rx_tmp_jif) > 50) && | 1229 | else if ((time_after(jiffies, iadev->rx_tmp_jif + 50)) && |
1229 | ((iadev->rx_pkt_cnt - iadev->rx_tmp_cnt) == 0)) { | 1230 | ((iadev->rx_pkt_cnt - iadev->rx_tmp_cnt) == 0)) { |
1230 | for (i = 1; i <= iadev->num_rx_desc; i++) | 1231 | for (i = 1; i <= iadev->num_rx_desc; i++) |
1231 | free_desc(dev, i); | 1232 | free_desc(dev, i); |