devices/forcedeth-2.6.19-ethercat.c
changeset 586 99df3f4d8d76
parent 583 172d42146930
child 591 2b949dcba32b
--- a/devices/forcedeth-2.6.19-ethercat.c	Wed Feb 21 12:41:25 2007 +0000
+++ b/devices/forcedeth-2.6.19-ethercat.c	Wed Feb 21 12:42:20 2007 +0000
@@ -1483,6 +1483,7 @@
             spin_unlock_irq(&np->lock);
             netif_stop_queue(dev);
             return NETDEV_TX_BUSY;
+        }
 	}
 
 	/* setup the header buffer */
@@ -1824,6 +1825,7 @@
 		pci_unmap_single(np->pci_dev, np->rx_dma[i],
 				np->rx_skbuff[i]->end-np->rx_skbuff[i]->data,
 				PCI_DMA_FROMDEVICE);
+
 		{
 			int j;
 			dprintk(KERN_DEBUG "Dumping packet (flags 0x%x).",flags);
@@ -2891,7 +2893,7 @@
 
 void ec_poll(struct net_device *dev)
 {
-    nv_nic_irq((int) 0, dev, (struct pt_regs *) NULL);
+    nv_nic_irq(0, dev);
 }
 
 static void nv_do_nic_poll(unsigned long data)