patch-2.4.20 linux-2.4.20/drivers/atm/iphase.c
Next file: linux-2.4.20/drivers/atm/lanai.c
Previous file: linux-2.4.20/drivers/atm/firestream.c
Back to the patch index
Back to the overall index
- Lines: 19
- Date:
Thu Nov 28 15:53:12 2002
- Orig file:
linux-2.4.19/drivers/atm/iphase.c
- Orig date:
Mon Feb 25 11:37:57 2002
diff -urN linux-2.4.19/drivers/atm/iphase.c linux-2.4.20/drivers/atm/iphase.c
@@ -124,7 +124,7 @@
}
static int ia_enque_rtn_q (IARTN_Q *que, struct desc_tbl_t data) {
- IARTN_Q *entry = kmalloc(sizeof(*entry), GFP_KERNEL);
+ IARTN_Q *entry = kmalloc(sizeof(*entry), GFP_ATOMIC);
if (!entry) return -1;
entry->data = data;
entry->next = NULL;
@@ -208,8 +208,7 @@
ltimeout = dev->desc_tbl[i].iavcc->ltimeout;
delta = jiffies - dev->desc_tbl[i].timestamp;
if (delta >= ltimeout) {
- IF_ABR(printk("RECOVER run!! desc_tbl %d = %d delta = %ld,
- time = %ld\n", i,dev->desc_tbl[i].timestamp, delta, jiffies);)
+ IF_ABR(printk("RECOVER run!! desc_tbl %d = %d delta = %ld, time = %ld\n", i,dev->desc_tbl[i].timestamp, delta, jiffies);)
if (dev->ffL.tcq_rd == dev->ffL.tcq_st)
dev->ffL.tcq_rd = dev->ffL.tcq_ed;
else
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)