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/tlan.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/tlan.c')
| -rw-r--r-- | src/drivers/net/tlan.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/drivers/net/tlan.c b/src/drivers/net/tlan.c index e1ff5641..10593208 100644 --- a/src/drivers/net/tlan.c +++ b/src/drivers/net/tlan.c @@ -809,7 +809,7 @@ static int tlan_probe ( struct nic *nic, struct pci_device *pci ) { priv->vendor_id = pci->vendor; priv->dev_id = pci->device; - priv->nic_name = pci->name; + priv->nic_name = pci->driver_name; priv->eoc = 0; err = 0; @@ -820,10 +820,10 @@ static int tlan_probe ( struct nic *nic, struct pci_device *pci ) { (u8 *) & nic->node_addr[i]); if (err) { printf ( "TLAN: %s: Error reading MAC from eeprom: %d\n", - pci->name, err); + pci->driver_name, err); } else { DBG ( "%s: %s at ioaddr %#lX, ", - pci->name, eth_ntoa ( nic->node_addr ), pci->ioaddr ); + pci->driver_name, eth_ntoa ( nic->node_addr ), pci->ioaddr ); } priv->tlanRev = TLan_DioRead8(BASE, TLAN_DEF_REVISION); |