--- upstream/dynamips-0.2.7-RC1/dev_c3600_eth.c	2007/10/06 16:23:47	7
+++ upstream/dynamips-0.2.7-RC2/dev_c3600_eth.c	2007/10/06 16:24:54	8
@@ -67,7 +67,7 @@
       data->port[i] = dev_am79c971_init(router->vm,name,interface_type,
                                         router->nm_bay[nm_bay].pci_map,
                                         bay_info->pci_device + i,
-                                        C3600_NETIO_IRQ);
+                                        c3600_net_irq_for_slot_port(nm_bay,i));
    }
 
    /* Store device info into the router structure */
@@ -198,7 +198,8 @@
    /* Create the device */
    data = dev_nm_16esw_init(router->vm,name,nm_bay,
                             router->nm_bay[nm_bay].pci_map,
-                            bay_info->pci_device,C3600_NETIO_IRQ);
+                            bay_info->pci_device,
+                            c3600_net_irq_for_slot_port(nm_bay,0));
 
    /* Store device info into the router structure */
    return(c3600_nm_set_drvinfo(router,nm_bay,data));