netif: MSI actually never worked, so comment out the pci_alloc_msi

diff --git a/sys/dev/netif/alc/if_alc.c b/sys/dev/netif/alc/if_alc.c
index ad721ec..2867de6 100644 (file)
--- a/sys/dev/netif/alc/if_alc.c
+++ b/sys/dev/netif/alc/if_alc.c
@@ -925,6 +925,8 @@ alc_attach(device_t dev)
                device_printf(dev, "MSIX count : %d\n", msixc);
                device_printf(dev, "MSI count : %d\n", msic);
        }
+
+#if 0
        /* Prefer MSIX over MSI. */
        if (msix_disable == 0 || msi_disable == 0) {
                if (msix_disable == 0 && msixc == ALC_MSIX_MESSAGES &&
@@ -949,6 +951,7 @@ alc_attach(device_t dev)
                                pci_release_msi(dev);
                }
        }
+#endif
 
        error = bus_alloc_resources(dev, sc->alc_irq_spec, sc->alc_irq);
        if (error != 0) {

diff --git a/sys/dev/netif/e1000/if_igb.c b/sys/dev/netif/e1000/if_igb.c
index dbbdb8e..d22cc92 100644 (file)
--- a/sys/dev/netif/e1000/if_igb.c
+++ b/sys/dev/netif/e1000/if_igb.c
@@ -2438,6 +2438,7 @@ mem:
 static int
 igb_setup_msix(struct adapter *adapter)
 {
+#if 0
        device_t dev = adapter->dev;
        int rid, want, queues, msgs;
 
@@ -2503,6 +2504,9 @@ msi:
                if (msgs == 1 && pci_alloc_msi(dev, &msgs) == 0)
                        device_printf(adapter->dev,"Using MSI interrupt\n");
        return (msgs);
+#else
+       return 0;
+#endif
 }
 
 /*********************************************************************

diff --git a/sys/dev/netif/iwn/if_iwn.c b/sys/dev/netif/iwn/if_iwn.c
index 1145b15..a4ec95a 100644 (file)
--- a/sys/dev/netif/iwn/if_iwn.c
+++ b/sys/dev/netif/iwn/if_iwn.c
@@ -476,9 +476,11 @@ iwn_pci_attach(device_t dev)
        sc->sc_st = rman_get_bustag(sc->mem);
        sc->sc_sh = rman_get_bushandle(sc->mem);
        sc->irq_rid = 0;
+#if 0
        if ((result = pci_msi_count(dev)) == 1 &&
            pci_alloc_msi(dev, &result) == 0)
                sc->irq_rid = 1;
+#endif
        sc->irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &sc->irq_rid,
            RF_ACTIVE | RF_SHAREABLE);
        if (sc->irq == NULL) {

diff --git a/sys/dev/netif/mxge/if_mxge.c b/sys/dev/netif/mxge/if_mxge.c
index 82ace01..3f74432 100644 (file)
--- a/sys/dev/netif/mxge/if_mxge.c
+++ b/sys/dev/netif/mxge/if_mxge.c
@@ -4394,7 +4394,7 @@ mxge_add_single_irq(mxge_softc_t *sc)
        int count, err, rid;
 
        count = pci_msi_count(sc->dev);
-       if (count == 1 && pci_alloc_msi(sc->dev, &count) == 0) {
+       if (/* count == 1 && pci_alloc_msi(sc->dev, &count) == 0 */0) {
                rid = 1;
        } else {
                rid = 0;