diff options
| author | Michael Brown | 2005-04-13 01:47:52 +0200 |
|---|---|---|
| committer | Michael Brown | 2005-04-13 01:47:52 +0200 |
| commit | d9c64c94222f9aaf80005e12608c6049632f06d9 (patch) | |
| tree | 6753c29d89a7fe8eae553a4e3c2c5a7dcefa9f25 /src/drivers/net | |
| parent | Automatically updated using (diff) | |
| download | ipxe-d9c64c94222f9aaf80005e12608c6049632f06d9.tar.gz ipxe-d9c64c94222f9aaf80005e12608c6049632f06d9.tar.xz ipxe-d9c64c94222f9aaf80005e12608c6049632f06d9.zip | |
Manual tweaks to get all drivers to follow the "disable, poll, transmit,
irq" pattern.
Diffstat (limited to 'src/drivers/net')
| -rw-r--r-- | src/drivers/net/mtd80x.c | 1 | ||||
| -rw-r--r-- | src/drivers/net/pcnet32.c | 2 | ||||
| -rw-r--r-- | src/drivers/net/r8169.c | 2 | ||||
| -rw-r--r-- | src/drivers/net/skel.c | 1 | ||||
| -rw-r--r-- | src/drivers/net/sundance.c | 2 | ||||
| -rw-r--r-- | src/drivers/net/via-rhine.c | 2 |
6 files changed, 6 insertions, 4 deletions
diff --git a/src/drivers/net/mtd80x.c b/src/drivers/net/mtd80x.c index f42fc7d8..304db5a8 100644 --- 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 index 79f68b07..4476be37 100644 --- 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 index c6cb7a40..4eaace1c 100644 --- 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 index 26188990..d5519955 100644 --- 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 index 0c00fab3..141c21d4 100644 --- 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 index b2197ef3..f142c59c 100644 --- 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; |