patch-2.3.47 linux/drivers/net/epic100.c

• Lines: 56
• Date: Sun Feb 20 09:06:14 2000
• Orig file: v2.3.46/linux/drivers/net/epic100.c
• Orig date: Wed Feb 16 17:03:52 2000

diff -u --recursive --new-file v2.3.46/linux/drivers/net/epic100.c linux/drivers/net/epic100.c
@@ -775,7 +775,7 @@
 #endif
 
 			if (ep->tx_full &&
-			    test_bit(LINK_STATE_XOFF, &dev->flags) &&
+			    netif_queue_stopped(dev) &&
 			    dirty_tx > ep->cur_tx - TX_RING_SIZE + 2) {
 				/* The ring is no longer full, clear tbusy. */
 				ep->tx_full = 0;
@@ -970,7 +970,7 @@
 	struct epic_private *ep = (struct epic_private *)dev->priv;
 	long ioaddr = dev->base_addr;
 
-	if (test_bit(LINK_STATE_START, &dev->state)) {
+	if (netif_running(dev)) {
 		/* Update the error counts. */
 		ep->stats.rx_missed_errors += inb(ioaddr + MPCNT);
 		ep->stats.rx_frame_errors += inb(ioaddr + ALICNT);
@@ -1058,12 +1058,12 @@
 		data[0] = ((struct epic_private *)dev->priv)->phys[0] & 0x1f;
 		/* Fall Through */
 	case SIOCDEVPRIVATE+1:		/* Read the specified MII register. */
-		if (! test_bit(LINK_STATE_START, &dev->state)) {
+		if (! netif_running(dev)) {
 			outl(0x0200, ioaddr + GENCTL);
 			outl((inl(ioaddr + NVCTL) & ~0x003C) | 0x4800, ioaddr + NVCTL);
 		}
 		data[3] = mdio_read(ioaddr, data[0] & 0x1f, data[1] & 0x1f);
-		if (! test_bit(LINK_STATE_START, &dev->state)) {
+		if (! netif_running(dev)) {
 #ifdef notdef
 			outl(0x0008, ioaddr + GENCTL);
 			outl((inl(ioaddr + NVCTL) & ~0x483C) | 0x0000, ioaddr + NVCTL);
@@ -1073,12 +1073,12 @@
 	case SIOCDEVPRIVATE+2:		/* Write the specified MII register */
 		if (!suser())
 			return -EPERM;
-		if (! test_bit(LINK_STATE_START, &dev->state)) {
+		if (! netif_running(dev)) {
 			outl(0x0200, ioaddr + GENCTL);
 			outl((inl(ioaddr + NVCTL) & ~0x003C) | 0x4800, ioaddr + NVCTL);
 		}
 		mdio_write(ioaddr, data[0] & 0x1f, data[1] & 0x1f, data[2]);
-		if (! test_bit(LINK_STATE_START, &dev->state)) {
+		if (! netif_running(dev)) {
 #ifdef notdef
 			outl(0x0008, ioaddr + GENCTL);
 			outl((inl(ioaddr + NVCTL) & ~0x483C) | 0x0000, ioaddr + NVCTL);
@@ -1285,6 +1285,7 @@
 	if (pci_register_driver (&epic100_driver) > 0)
 		return 0;
 	
+	pci_unregister_driver (&epic100_driver);
 	return -ENODEV;
 }