|
@@ -469,7 +469,7 @@ static int dmfe_probe ( struct nic *nic, struct pci_device *pci ) {
|
469
|
469
|
|
470
|
470
|
BASE = pci->ioaddr;
|
471
|
471
|
printf("dmfe.c: Found %s Vendor=0x%hX Device=0x%hX\n",
|
472
|
|
- dev->name, pci->vendor, pci->dev_id);
|
|
472
|
+ pci->name, pci->vendor_id, pci->device_id);
|
473
|
473
|
|
474
|
474
|
/* Read Chip revision */
|
475
|
475
|
pci_read_config_dword(pci, PCI_REVISION_ID, &dev_rev);
|
|
@@ -478,7 +478,7 @@ static int dmfe_probe ( struct nic *nic, struct pci_device *pci ) {
|
478
|
478
|
/* point to private storage */
|
479
|
479
|
db = &dfx;
|
480
|
480
|
|
481
|
|
- db->chip_id = ((u32) pci->dev_id << 16) | pci->vendor;
|
|
481
|
+ db->chip_id = ((u32) pci->device_id << 16) | pci->vendor_id;
|
482
|
482
|
BASE = pci_bar_start(pci, PCI_BASE_ADDRESS_0);
|
483
|
483
|
db->chip_revision = dev_rev;
|
484
|
484
|
|
|
@@ -500,7 +500,7 @@ static int dmfe_probe ( struct nic *nic, struct pci_device *pci ) {
|
500
|
500
|
nic->node_addr[i] = db->srom[20 + i];
|
501
|
501
|
|
502
|
502
|
/* Print out some hardware info */
|
503
|
|
- printf("%s: %! at ioaddr %hX\n", dev->name, nic->node_addr, BASE);
|
|
503
|
+ printf("%s: %! at ioaddr %hX\n", pci->name, nic->node_addr, BASE);
|
504
|
504
|
|
505
|
505
|
/* Set the card as PCI Bus Master */
|
506
|
506
|
adjust_pci_device(pci);
|