diff options
| author | Marty Connor | 2007-12-13 17:08:40 +0100 |
|---|---|---|
| committer | Marty Connor | 2007-12-13 17:08:40 +0100 |
| commit | 1a867bfb3949ff4131834cddd491428a056b63ce (patch) | |
| tree | 53d22902865655e390486acc135688b1022ea139 /src/drivers/net/r8169.c | |
| parent | Remove the obsolete pre-aBFT AoE boot table. (diff) | |
| download | ipxe-1a867bfb3949ff4131834cddd491428a056b63ce.tar.gz ipxe-1a867bfb3949ff4131834cddd491428a056b63ce.tar.xz ipxe-1a867bfb3949ff4131834cddd491428a056b63ce.zip | |
Remove *_fill_nic() calls, and directly set nic->ioaddr and nic->irqno .
This needs to be done manually because if the irq() routine is
implemented then we want something like "nic->irqno = pci->irqno;",
else we do "nic->irqno = 0;" nic->ioaddr may also need to be set
carefully.
Also added local variables to end of many files, for emacs indentation
to match kernel style (tab does 8 space indent).
Diffstat (limited to 'src/drivers/net/r8169.c')
| -rw-r--r-- | src/drivers/net/r8169.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/src/drivers/net/r8169.c b/src/drivers/net/r8169.c index 90dd2c3b..52cb0d0e 100644 --- a/src/drivers/net/r8169.c +++ b/src/drivers/net/r8169.c @@ -1024,13 +1024,14 @@ static int r8169_probe ( struct nic *nic, struct pci_device *pci ) { } r8169_reset(nic); + /* point to NIC specific routines */ - nic->nic_op = &r8169_operations; - pci_fill_nic ( nic, pci ); - nic->irqno = pci->irq; + nic->nic_op = &r8169_operations; + + nic->irqno = pci->irq; nic->ioaddr = ioaddr; - return 1; + return 1; } //====================================================================================================== @@ -1174,3 +1175,11 @@ static void rtl8169_hw_PHY_config(struct nic *nic __unused) DRIVER ( "r8169/PCI", nic_driver, pci_driver, r8169_driver, r8169_probe, r8169_disable ); + +/* + * Local variables: + * c-basic-offset: 8 + * c-indent-level: 8 + * tab-width: 8 + * End: + */ |