Manual tweaks to get all drivers to follow the "disable, poll, transmit,

irq" pattern.
ipxe · Apr 12, 2005 · d9c64c9 · d9c64c9
1 parent 881023e
commit d9c64c9
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 4 deletions.
diff --git a/src/drivers/net/mtd80x.c b/src/drivers/net/mtd80x.c
@@ -766,6 +766,7 @@ static int mtd_probe ( struct dev *dev ) {
     dev->disable  = mtd_disable;
     nic->poll     = mtd_poll;
     nic->transmit = mtd_transmit;
+    nic->irq	  = dummy_irq;
     return 1;
 }
 

diff --git a/src/drivers/net/pcnet32.c b/src/drivers/net/pcnet32.c
@@ -946,9 +946,9 @@ static int pcnet32_probe ( struct dev *dev ) {
 			printf("\n");
 	}
 
+	dev->disable  = pcnet32_disable;
 	nic->poll     = pcnet32_poll;
 	nic->transmit = pcnet32_transmit;
-	dev->disable  = pcnet32_disable;
 	nic->irq      = pcnet32_irq;
 
 	return 1;

diff --git a/src/drivers/net/r8169.c b/src/drivers/net/r8169.c
@@ -834,8 +834,8 @@ static int r8169_probe ( struct dev *dev ) {
 	dev->disable = r8169_disable;
 	nic->poll = r8169_poll;
 	nic->transmit = r8169_transmit;
-	nic->irqno = pci->irq;
 	nic->irq = r8169_irq;
+	nic->irqno = pci->irq;
 	nic->ioaddr = ioaddr;
 	return 1;
 

diff --git a/src/drivers/net/skel.c b/src/drivers/net/skel.c
@@ -177,6 +177,7 @@ static int skel_isa_probe(struct dev *dev, unsigned short *probe_addrs)
 		dev->disable  = skel_disable;
 		nic->poll     = skel_poll;
 		nic->transmit = skel_transmit;
+		nic->irq      = skel_irq;
 
 		/* Report the ISA pnp id of the board */
 		dev->devid.vendor_id = htons(GENERIC_ISAPNP_VENDOR);

diff --git a/src/drivers/net/sundance.c b/src/drivers/net/sundance.c
@@ -738,8 +738,8 @@ static int sundance_probe ( struct dev *dev ) {
 	dev->disable = sundance_disable;
 	nic->poll = sundance_poll;
 	nic->transmit = sundance_transmit;
-	nic->irqno = pci->irq;
 	nic->irq = sundance_irq;
+	nic->irqno = pci->irq;
 	nic->ioaddr = BASE;
 
 	return 1;

diff --git a/src/drivers/net/via-rhine.c b/src/drivers/net/via-rhine.c
@@ -967,8 +967,8 @@ rhine_probe ( struct dev *dev ) {
     dev->disable  = rhine_disable;
     nic->poll     = rhine_poll;
     nic->transmit = rhine_transmit;
-    nic->irqno	  = pci->irq;
     nic->irq      = rhine_irq;
+    nic->irqno	  = pci->irq;
     nic->ioaddr   = tp->ioaddr;