patch-2.1.34 linux/drivers/net/myri_sbus.c

• Lines: 27
• Date: Fri Apr 11 22:12:34 1997
• Orig file: v2.1.33/linux/drivers/net/myri_sbus.c
• Orig date: Thu Mar 27 14:40:04 1997

diff -u --recursive --new-file v2.1.33/linux/drivers/net/myri_sbus.c linux/drivers/net/myri_sbus.c
@@ -262,7 +262,7 @@
 	int gfp_flags = GFP_KERNEL;
 	int i;
 
-	if(from_irq || intr_count)
+	if(from_irq || in_interrupt())
 		gfp_flags = GFP_ATOMIC;
 
 	myri_clean_rings(mp);
@@ -534,7 +534,7 @@
 {
 	struct myri_eth *mp = (struct myri_eth *) dev->priv;
 
-	return myri_init(mp, intr_count);
+	return myri_init(mp, in_interrupt());
 }
 
 static int myri_close(struct device *dev)
@@ -570,7 +570,7 @@
 			DTX(("resetting, return 0\n"));
 			printk("%s: transmit timed out, resetting\n", dev->name);
 			mp->enet_stats.tx_errors++;
-			myri_init(mp, intr_count);
+			myri_init(mp, in_interrupt());
 			dev->tbusy = 0;
 			dev->trans_start = jiffies;
 			return 0;