summaryrefslogtreecommitdiffstats
path: root/src/arch/i386/drivers/net/undi.c
diff options
context:
space:
mode:
authorMichael Brown2007-01-10 16:27:48 +0100
committerMichael Brown2007-01-10 16:27:48 +0100
commitfdc97499bf83ef958db8a50985fdd321835dccf3 (patch)
tree344a37ef66fa70650a85cd7429ad139bc7b284e0 /src/arch/i386/drivers/net/undi.c
parentGive UNDI device a more meaningful name. (diff)
downloadipxe-fdc97499bf83ef958db8a50985fdd321835dccf3.tar.gz
ipxe-fdc97499bf83ef958db8a50985fdd321835dccf3.tar.xz
ipxe-fdc97499bf83ef958db8a50985fdd321835dccf3.zip
Add device description fields to struct device.
Diffstat (limited to 'src/arch/i386/drivers/net/undi.c')
-rw-r--r--src/arch/i386/drivers/net/undi.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/arch/i386/drivers/net/undi.c b/src/arch/i386/drivers/net/undi.c
index 492e8fa0..c93ad247 100644
--- a/src/arch/i386/drivers/net/undi.c
+++ b/src/arch/i386/drivers/net/undi.c
@@ -64,7 +64,7 @@ static int undipci_probe ( struct pci_device *pci,
const struct pci_device_id *id __unused ) {
struct undi_device *undi;
struct undi_rom *undirom;
- unsigned int busdevfn = ( ( pci->bus << 8 ) | pci->devfn );
+ unsigned int busdevfn = PCI_BUSDEVFN ( pci->bus, pci->devfn );
int rc;
/* Ignore non-network devices */
@@ -99,6 +99,7 @@ static int undipci_probe ( struct pci_device *pci,
/* Add to device hierarchy */
snprintf ( undi->dev.name, sizeof ( undi->dev.name ),
"UNDI-%s", pci->dev.name );
+ memcpy ( &undi->dev.desc, &pci->dev.desc, sizeof ( undi->dev.desc ) );
undi->dev.parent = &pci->dev;
INIT_LIST_HEAD ( &undi->dev.children );
list_add ( &undi->dev.siblings, &pci->dev.children );