enic: Bug fix: Free MSI intr with correct data handle

Bug fix: Free MSI intr with correct data handle
Use davem proposed naming for MSI-X tx/rx vectors (ethX-tx-0, ethX-rx-0)

Signed-off-by: Scott Feldman <scofeldm@cisco.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c
index 03b646a5aec8c7e38be5ed11679a07b38e971f11..d403ce29a1418e408d3071410735d07be0ac641b 100644 (file)
--- a/drivers/net/enic/enic_main.c
+++ b/drivers/net/enic/enic_main.c
@@ -1133,9 +1133,11 @@ static void enic_free_intr(struct enic *enic)
 
        switch (vnic_dev_get_intr_mode(enic->vdev)) {
        case VNIC_DEV_INTR_MODE_INTX:
-       case VNIC_DEV_INTR_MODE_MSI:
                free_irq(enic->pdev->irq, netdev);
                break;
+       case VNIC_DEV_INTR_MODE_MSI:
+               free_irq(enic->pdev->irq, enic);
+               break;
        case VNIC_DEV_INTR_MODE_MSIX:
                for (i = 0; i < ARRAY_SIZE(enic->msix); i++)
                        if (enic->msix[i].requested)
@@ -1170,12 +1172,12 @@ static int enic_request_intr(struct enic *enic)
        case VNIC_DEV_INTR_MODE_MSIX:
 
                sprintf(enic->msix[ENIC_MSIX_RQ].devname,
-                       "%.11s-rx", netdev->name);
+                       "%.11s-rx-0", netdev->name);
                enic->msix[ENIC_MSIX_RQ].isr = enic_isr_msix_rq;
                enic->msix[ENIC_MSIX_RQ].devid = enic;
 
                sprintf(enic->msix[ENIC_MSIX_WQ].devname,
-                       "%.11s-tx", netdev->name);
+                       "%.11s-tx-0", netdev->name);
                enic->msix[ENIC_MSIX_WQ].isr = enic_isr_msix_wq;
                enic->msix[ENIC_MSIX_WQ].devid = enic;