diff options
Diffstat (limited to 'drivers/net/qlge')
-rw-r--r-- | drivers/net/qlge/qlge_main.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c index d2a4bbe5ef3b..e2ee47d9bca5 100644 --- a/drivers/net/qlge/qlge_main.c +++ b/drivers/net/qlge/qlge_main.c | |||
@@ -69,9 +69,9 @@ MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)"); | |||
69 | #define MSIX_IRQ 0 | 69 | #define MSIX_IRQ 0 |
70 | #define MSI_IRQ 1 | 70 | #define MSI_IRQ 1 |
71 | #define LEG_IRQ 2 | 71 | #define LEG_IRQ 2 |
72 | static int irq_type = MSIX_IRQ; | 72 | static int qlge_irq_type = MSIX_IRQ; |
73 | module_param(irq_type, int, MSIX_IRQ); | 73 | module_param(qlge_irq_type, int, MSIX_IRQ); |
74 | MODULE_PARM_DESC(irq_type, "0 = MSI-X, 1 = MSI, 2 = Legacy."); | 74 | MODULE_PARM_DESC(qlge_irq_type, "0 = MSI-X, 1 = MSI, 2 = Legacy."); |
75 | 75 | ||
76 | static struct pci_device_id qlge_pci_tbl[] __devinitdata = { | 76 | static struct pci_device_id qlge_pci_tbl[] __devinitdata = { |
77 | {PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, QLGE_DEVICE_ID_8012)}, | 77 | {PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, QLGE_DEVICE_ID_8012)}, |
@@ -2870,7 +2870,7 @@ static void ql_enable_msix(struct ql_adapter *qdev) | |||
2870 | int i, err; | 2870 | int i, err; |
2871 | 2871 | ||
2872 | /* Get the MSIX vectors. */ | 2872 | /* Get the MSIX vectors. */ |
2873 | if (irq_type == MSIX_IRQ) { | 2873 | if (qlge_irq_type == MSIX_IRQ) { |
2874 | /* Try to alloc space for the msix struct, | 2874 | /* Try to alloc space for the msix struct, |
2875 | * if it fails then go to MSI/legacy. | 2875 | * if it fails then go to MSI/legacy. |
2876 | */ | 2876 | */ |
@@ -2878,7 +2878,7 @@ static void ql_enable_msix(struct ql_adapter *qdev) | |||
2878 | sizeof(struct msix_entry), | 2878 | sizeof(struct msix_entry), |
2879 | GFP_KERNEL); | 2879 | GFP_KERNEL); |
2880 | if (!qdev->msi_x_entry) { | 2880 | if (!qdev->msi_x_entry) { |
2881 | irq_type = MSI_IRQ; | 2881 | qlge_irq_type = MSI_IRQ; |
2882 | goto msi; | 2882 | goto msi; |
2883 | } | 2883 | } |
2884 | 2884 | ||
@@ -2901,7 +2901,7 @@ static void ql_enable_msix(struct ql_adapter *qdev) | |||
2901 | QPRINTK(qdev, IFUP, WARNING, | 2901 | QPRINTK(qdev, IFUP, WARNING, |
2902 | "MSI-X Enable failed, trying MSI.\n"); | 2902 | "MSI-X Enable failed, trying MSI.\n"); |
2903 | qdev->intr_count = 1; | 2903 | qdev->intr_count = 1; |
2904 | irq_type = MSI_IRQ; | 2904 | qlge_irq_type = MSI_IRQ; |
2905 | } else if (err == 0) { | 2905 | } else if (err == 0) { |
2906 | set_bit(QL_MSIX_ENABLED, &qdev->flags); | 2906 | set_bit(QL_MSIX_ENABLED, &qdev->flags); |
2907 | QPRINTK(qdev, IFUP, INFO, | 2907 | QPRINTK(qdev, IFUP, INFO, |
@@ -2912,7 +2912,7 @@ static void ql_enable_msix(struct ql_adapter *qdev) | |||
2912 | } | 2912 | } |
2913 | msi: | 2913 | msi: |
2914 | qdev->intr_count = 1; | 2914 | qdev->intr_count = 1; |
2915 | if (irq_type == MSI_IRQ) { | 2915 | if (qlge_irq_type == MSI_IRQ) { |
2916 | if (!pci_enable_msi(qdev->pdev)) { | 2916 | if (!pci_enable_msi(qdev->pdev)) { |
2917 | set_bit(QL_MSI_ENABLED, &qdev->flags); | 2917 | set_bit(QL_MSI_ENABLED, &qdev->flags); |
2918 | QPRINTK(qdev, IFUP, INFO, | 2918 | QPRINTK(qdev, IFUP, INFO, |
@@ -2920,7 +2920,7 @@ msi: | |||
2920 | return; | 2920 | return; |
2921 | } | 2921 | } |
2922 | } | 2922 | } |
2923 | irq_type = LEG_IRQ; | 2923 | qlge_irq_type = LEG_IRQ; |
2924 | QPRINTK(qdev, IFUP, DEBUG, "Running with legacy interrupts.\n"); | 2924 | QPRINTK(qdev, IFUP, DEBUG, "Running with legacy interrupts.\n"); |
2925 | } | 2925 | } |
2926 | 2926 | ||