diff options
| author | Michael Brown <mcb30@etherboot.org> | 2007-01-10 04:22:09 +0000 |
|---|---|---|
| committer | Michael Brown <mcb30@etherboot.org> | 2007-01-10 04:22:09 +0000 |
| commit | dad52745227fd06090e73ea535e0b0fe0f667c60 (patch) | |
| tree | 6be296bedc785a5aab0d055ae148c6ffb1fe285f /src/drivers/net/forcedeth.c | |
| parent | cc9b32c405ef57f636f0b91c04edbbd7bcee68ef (diff) | |
| download | ipxe-dad52745227fd06090e73ea535e0b0fe0f667c60.tar.gz | |
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/forcedeth.c')
| -rw-r--r-- | src/drivers/net/forcedeth.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/drivers/net/forcedeth.c b/src/drivers/net/forcedeth.c index 67f0c1ee0..2008c39a1 100644 --- a/src/drivers/net/forcedeth.c +++ b/src/drivers/net/forcedeth.c @@ -1246,7 +1246,7 @@ static int forcedeth_probe ( struct nic *nic, struct pci_device *pci ) { return 0; printf("forcedeth.c: Found %s, vendor=0x%hX, device=0x%hX\n", - pci->name, pci->vendor, pci->device); + pci->driver_name, pci->vendor, pci->device); pci_fill_nic ( nic, pci ); @@ -1306,7 +1306,7 @@ static int forcedeth_probe ( struct nic *nic, struct pci_device *pci ) { } #endif - DBG ( "%s: MAC Address %s\n", pci->name, eth_ntoa ( nic->node_addr ) ); + DBG ( "%s: MAC Address %s\n", pci->driver_name, eth_ntoa ( nic->node_addr ) ); /* disable WOL */ writel(0, base + NvRegWakeUpFlags); @@ -1381,7 +1381,7 @@ static int forcedeth_probe ( struct nic *nic, struct pci_device *pci ) { id2 = (id2 & PHYID2_OUI_MASK) >> PHYID2_OUI_SHFT; dprintf (("%s: open: Found PHY %hX:%hX at address %d.\n", - pci->name, id1, id2, i)); + pci->driver_name, id1, id2, i)); np->phyaddr = i; np->phy_oui = id1 | id2; break; @@ -1391,7 +1391,7 @@ static int forcedeth_probe ( struct nic *nic, struct pci_device *pci ) { * test loopback? Very odd, but can be correct. */ printf - ("%s: open: Could not find a valid PHY.\n", pci->name); + ("%s: open: Could not find a valid PHY.\n", pci->driver_name); } if (i != 32) { @@ -1400,7 +1400,7 @@ static int forcedeth_probe ( struct nic *nic, struct pci_device *pci ) { } dprintf(("%s: forcedeth.c: subsystem: %hX:%hX bound to %s\n", - pci->name, pci->vendor, pci->dev_id, pci->name)); + pci->driver_name, pci->vendor, pci->dev_id, pci->driver_name)); if(!forcedeth_reset(nic)) return 0; // no valid link /* point to NIC specific routines */ |