|
@@ -60,7 +60,8 @@
|
|
|
#include <asm/uaccess.h>
|
|
|
#include <asm/string.h>
|
|
|
#include <asm/byteorder.h>
|
|
|
-#include <linux/vmalloc.h>
|
|
|
+#include <linux/vmalloc.h>
|
|
|
+#include <linux/jiffies.h>
|
|
|
#include "iphase.h"
|
|
|
#include "suni.h"
|
|
|
#define swap(x) (((x & 0xff) << 8) | ((x & 0xff00) >> 8))
|
|
@@ -189,7 +190,7 @@ static u16 get_desc (IADEV *dev, struct ia_vcc *iavcc) {
|
|
|
int ltimeout;
|
|
|
|
|
|
ia_hack_tcq (dev);
|
|
|
- if(((jiffies - timer)>50)||((dev->ffL.tcq_rd==dev->host_tcq_wr))){
|
|
|
+ if((time_after(jiffies,timer+50)) || ((dev->ffL.tcq_rd==dev->host_tcq_wr))) {
|
|
|
timer = jiffies;
|
|
|
i=0;
|
|
|
while (i < dev->num_tx_desc) {
|
|
@@ -1225,7 +1226,7 @@ static void rx_intr(struct atm_dev *dev)
|
|
|
iadev->rx_tmp_jif = jiffies;
|
|
|
iadev->rxing = 0;
|
|
|
}
|
|
|
- else if (((jiffies - iadev->rx_tmp_jif) > 50) &&
|
|
|
+ else if ((time_after(jiffies, iadev->rx_tmp_jif + 50)) &&
|
|
|
((iadev->rx_pkt_cnt - iadev->rx_tmp_cnt) == 0)) {
|
|
|
for (i = 1; i <= iadev->num_rx_desc; i++)
|
|
|
free_desc(dev, i);
|