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/r8169.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/r8169.c')
| -rw-r--r-- | src/drivers/net/r8169.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/drivers/net/r8169.c b/src/drivers/net/r8169.c index 3ec1f097..c806ccdc 100644 --- a/src/drivers/net/r8169.c +++ b/src/drivers/net/r8169.c @@ -884,7 +884,7 @@ static int r8169_probe ( struct nic *nic, struct pci_device *pci ) { int option = -1, Cap10_100 = 0, Cap1000 = 0; printf ( "r8169.c: Found %s, Vendor=%hX Device=%hX\n", - pci->name, pci->vendor, pci->device ); + pci->driver_name, pci->vendor, pci->device ); board_idx++; @@ -899,11 +899,11 @@ static int r8169_probe ( struct nic *nic, struct pci_device *pci ) { for (i = 0; i < MAC_ADDR_LEN; i++) nic->node_addr[i] = RTL_R8(MAC0 + i); - DBG ( "%s: Identified chip type is '%s'.\n", pci->name, + DBG ( "%s: Identified chip type is '%s'.\n", pci->driver_name, rtl_chip_info[tpc->chipset].name ); /* Print out some hardware info */ - DBG ( "%s: %s at IOAddr %#hX, ", pci->name, eth_ntoa ( nic->node_addr ), + DBG ( "%s: %s at IOAddr %#hX, ", pci->driver_name, eth_ntoa ( nic->node_addr ), ioaddr ); /* Config PHY */ @@ -965,7 +965,7 @@ static int r8169_probe ( struct nic *nic, struct pci_device *pci ) { RTL8169_WRITE_GMII_REG(ioaddr, PHY_1000_CTRL_REG, Cap1000); } else { - DBG ( "%s: Auto-negotiation Enabled.\n", pci->name ); + DBG ( "%s: Auto-negotiation Enabled.\n", pci->driver_name ); // enable 10/100 Full/Half Mode, leave PHY_AUTO_NEGO_REG bit4:0 unchanged RTL8169_WRITE_GMII_REG(ioaddr, PHY_AUTO_NEGO_REG, @@ -1016,7 +1016,7 @@ static int r8169_probe ( struct nic *nic, struct pci_device *pci ) { udelay(100); printf ("%s: 1000Mbps Full-duplex operation, TBI Link %s!\n", - pci->name, + pci->driver_name, (RTL_R32(TBICSR) & TBILinkOK) ? "OK" : "Failed"); } |