Ticket #3124: reproduce.diff

src/add-ons/kernel/drivers/network/3com/pci/if_xl.c

@@ -144 +144 @@
 
 #include <pci/if_xlreg.h>
 
+//QQQ
+
+extern const char *gDeviceNameList[];
+
 /*
  * TX Checksumming is disabled by default for two reasons:
  * - TX Checksumming will occasionally produce corrupt packets
@@ -1056 +1060 @@
 
     t = xl_devs;
 
+
+    //QQQ
+    //continue as on device found
+    device_set_desc(dev, t->xl_name);
+    return (BUS_PROBE_DEFAULT);
+    //QQQ
+
+
     while (t->xl_name != NULL) {
         if ((pci_get_vendor(dev) == t->xl_vid) &&
             (pci_get_device(dev) == t->xl_did)) {
@@ -1232 +1244 @@
     mtx_init(&sc->xl_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK,
         MTX_DEF);
     ifmedia_init(&sc->ifmedia, 0, xl_ifmedia_upd, xl_ifmedia_sts);
+//QQQ
+    //init device name
+    ifp = sc->xl_ifp = if_alloc(IFT_ETHER);
+    if (ifp == NULL) {
+        device_printf(dev, "can not if_alloc()\n");
+        error = ENOSPC;
+        goto fail;
+    }
+    ifp->if_softc = sc;
+    ktrace_printf("3com: xl_attach: a, gDeviceNameList[0]=%s\n", gDeviceNameList[0]);
+    if_initname(ifp, device_get_name(dev), device_get_unit(dev));
+    ktrace_printf("3com: xl_attach: b, gDeviceNameList[0]=%s\n", gDeviceNameList[0]);
+    //continue as on failure
+    error=ENXIO;
+    goto fail;
+//QQQ
 
     did = pci_get_device(dev);
 
@@ -1730 +1758 @@
     if (sc->xl_res)
         bus_release_resource(dev, res, rid, sc->xl_res);
 
+    ktrace_printf("xl_detach: aa, gDeviceNameList[0]=%s\n", gDeviceNameList[0]);
     if (ifp)
         if_free(ifp);
+    ktrace_printf("xl_detach: ab, gDeviceNameList[0]=%s\n", gDeviceNameList[0]);
 
     if (sc->xl_mtag) {
         bus_dmamap_destroy(sc->xl_mtag, sc->xl_tmpmap);