patch-2.1.49 linux/drivers/net/8390.c

Next file: linux/drivers/net/Config.in
Previous file: linux/drivers/misc/parport_pc.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.48/linux/drivers/net/8390.c linux/drivers/net/8390.c
@@ -191,7 +191,8 @@
 	printk("%s: Tx request while isr active.\n",dev->name);
 	outb_p(ENISR_ALL, e8390_base + EN0_IMR);
 	ei_local->stat.tx_errors++;
-	return 1;
+	dev_kfree_skb(skb, FREE_WRITE);
+	return 0;
     }
     ei_local->irqlock = 1;
 
@@ -305,6 +306,7 @@
     }
     
     dev->interrupt = 1;
+    sti();
     
     /* Change to page 0 and read the intr status reg. */
     outb_p(E8390_NODMA+E8390_PAGE0, e8390_base + E8390_CMD);

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