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

Next file: linux/drivers/net/loopback.c
Previous file: linux/drivers/net/de600.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.33/linux/drivers/net/eepro100.c linux/drivers/net/eepro100.c
@@ -1620,7 +1620,7 @@
 			printk("%s: Allocating a setup frame of size %d.\n",
 				   dev->name, sp->mc_setup_frm_len);
 			sp->mc_setup_frm = kmalloc(sp->mc_setup_frm_len,
-									   intr_count ? GFP_ATOMIC : GFP_KERNEL);
+									   in_interrupt() ? GFP_ATOMIC : GFP_KERNEL);
 			if (sp->mc_setup_frm == NULL) {
 			  printk("%s: Failed to allocate a setup frame.\n", dev->name);
 				sp->rx_mode = -1; /* We failed, try again. */

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov