diff options
| author | Michael Brown | 2007-01-10 05:22:09 +0100 |
|---|---|---|
| committer | Michael Brown | 2007-01-10 05:22:09 +0100 |
| commit | dad52745227fd06090e73ea535e0b0fe0f667c60 (patch) | |
| tree | 6be296bedc785a5aab0d055ae148c6ffb1fe285f /src/drivers/net/via-velocity.c | |
| parent | Remove uIP; we haven't used it for quite some time now. (diff) | |
| download | ipxe-dad52745227fd06090e73ea535e0b0fe0f667c60.tar.gz ipxe-dad52745227fd06090e73ea535e0b0fe0f667c60.tar.xz ipxe-dad52745227fd06090e73ea535e0b0fe0f667c60.zip | |
Add "name" field to struct device to allow human-readable hardware device
names.
Add "dev" pointer in struct net_device to tie network interfaces back to a
hardware device.
Force natural alignment of data types in __table() macros. This seems to
prevent gcc from taking the unilateral decision to occasionally increase
their alignment (which screws up the table packing).
Diffstat (limited to 'src/drivers/net/via-velocity.c')
| -rw-r--r-- | src/drivers/net/via-velocity.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/drivers/net/via-velocity.c b/src/drivers/net/via-velocity.c index 78a45ca9e..740cc30a3 100644 --- a/src/drivers/net/via-velocity.c +++ b/src/drivers/net/via-velocity.c @@ -673,7 +673,7 @@ static int velocity_probe(struct pci_device *dev, struct pci_device *pci) struct mac_regs *regs; printf("via-velocity.c: Found %s Vendor=0x%hX Device=0x%hX\n", - pci->name, pci->vendor, pci->device); + pci->driver_name, pci->vendor, pci->device); /* point to private storage */ vptr = &vptx; @@ -705,9 +705,9 @@ static int velocity_probe(struct pci_device *dev, struct pci_device *pci) for (i = 0; i < 6; i++) nic->node_addr[i] = readb(®s->PAR[i]); - DBG ( "%s: %s at ioaddr %#hX\n", pci->name, eth_ntoa ( nic->node_addr ), BASE ); + DBG ( "%s: %s at ioaddr %#hX\n", pci->driver_name, eth_ntoa ( nic->node_addr ), BASE ); - velocity_get_options(&vptr->options, 0, pci->name); + velocity_get_options(&vptr->options, 0, pci->driver_name); /* * Mask out the options cannot be set to the chip |