diff --git a/src/drivers/net/e1000.c b/src/drivers/net/e1000.c
index 690ff1f2..f9f8c4a4 100644
--- a/src/drivers/net/e1000.c
+++ b/src/drivers/net/e1000.c
@@ -3618,8 +3618,7 @@ static int e1000_probe ( struct nic *nic, struct pci_device *p ) {
 
 	adjust_pci_device(p);
 
-	nic->ioaddr   = p->ioaddr & ~3;
-	nic->irqno    = p->irq;
+	pci_fill_nic ( nic, p );
 
 	/* From Matt Hortman <mbhortman@acpthinclient.com> */
 	/* MAC and Phy settings */
diff --git a/src/drivers/net/eepro100.c b/src/drivers/net/eepro100.c
index 1857a9a1..59ed483f 100644
--- a/src/drivers/net/eepro100.c
+++ b/src/drivers/net/eepro100.c
@@ -617,13 +617,9 @@ static int eepro100_probe ( struct nic *nic, struct pci_device *p ) {
 
 	if (p->ioaddr == 0)
 		return 0;
-	ioaddr = p->ioaddr;
-	nic->ioaddr = ioaddr;
-
+	pci_fill_nic ( nic, pci );
 	adjust_pci_device(p);
-
-	/* Copy IRQ from PCI information */
-	nic->irqno = p->irq;
+	ioaddr = nic->ioaddr;
 
 	if ((do_eeprom_cmd(EE_READ_CMD << 24, 27) & 0xffe0000)
 		== 0xffe0000) {
diff --git a/src/drivers/net/mtd80x.c b/src/drivers/net/mtd80x.c
index a06c4d4c..51d49022 100644
--- a/src/drivers/net/mtd80x.c
+++ b/src/drivers/net/mtd80x.c
@@ -682,13 +682,12 @@ static int mtd_probe ( struct nic *nic, struct pci_device *pci ) {
     if (pci->ioaddr == 0)
 	    return 0;
 
-    /* Mask the bit that says "this is an io addr" */
-    mtdx.ioaddr = pci->ioaddr;
-
+    pci_fill_nic ( nic, pci );
     adjust_pci_device(pci);
 
     mtdx.nic_name = pci->name;
     mtdx.dev_id = pci->device_id;
+    mtdx.ioaddr = nic->ioaddr;
 
     /* read ethernet id */
     for (i = 0; i < 6; ++i)
diff --git a/src/drivers/net/prism2_plx.c b/src/drivers/net/prism2_plx.c
index 81d1c22e..36c0c5af 100644
--- a/src/drivers/net/prism2_plx.c
+++ b/src/drivers/net/prism2_plx.c
@@ -80,6 +80,8 @@ static int prism2_find_plx ( hfa384x_t *hw, struct pci_device *p )
 
 static int prism2_plx_probe ( struct nic *nic, struct pci_device *pci ) {
   hfa384x_t *hw = &hw_global;
+  
+  pci_fill_nic ( nic, pci );
 
   /* Find and intialise PLX Prism2 card */
   if ( ! prism2_find_plx ( hw, pci ) ) return 0;
diff --git a/src/drivers/net/tg3.c b/src/drivers/net/tg3.c
index b3af6d1d..d284bbf2 100644
--- a/src/drivers/net/tg3.c
+++ b/src/drivers/net/tg3.c
@@ -3241,8 +3241,8 @@ static int tg3_probe ( struct nic *nic, struct pci_device *pdev ) {
 
 	adjust_pci_device(pdev);
 
+	pci_fill_nic ( nic, pdev );
 	nic->irqno  = 0;
-	nic->ioaddr = pdev->ioaddr;
 
 	/* Find power-management capability. */
 	pm_cap = pci_find_capability(pdev, PCI_CAP_ID_PM);
diff --git a/src/drivers/net/w89c840.c b/src/drivers/net/w89c840.c
index 73609cc1..8863c764 100644
--- a/src/drivers/net/w89c840.c
+++ b/src/drivers/net/w89c840.c
@@ -634,8 +634,7 @@ static int w89c840_probe ( struct nic *nic, struct pci_device *p ) {
     if (p->ioaddr == 0)
         return 0;
 
-    ioaddr      = p->ioaddr;
-    nic->ioaddr = p->ioaddr & ~3;
+    pci_fill_nic ( nic, p );
     nic->irqno  = 0;