qlcnic: fix mailbox interrupt.

o Config interrupt is not needed for mailbox interrupts.

Signed-off-by: Sucheta Chakraborty <sucheta.chakraborty@qlogic.com>
Signed-off-by: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 4 insertions, 13 deletions

diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
index b95316831587..f084dc12a733 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
@@ -1965,11 +1965,8 @@ qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         return 0;
 
 err_out_disable_mbx_intr:
-        if (qlcnic_83xx_check(adapter)) {
-                if (adapter->flags & QLCNIC_MSIX_ENABLED)
-                        qlcnic_83xx_config_intrpt(adapter, 0);
+        if (qlcnic_83xx_check(adapter))
                 qlcnic_83xx_free_mbx_intr(adapter);
-        }
 
 err_out_disable_msi:
         qlcnic_teardown_intr(adapter);
@@ -2015,8 +2012,6 @@ static void qlcnic_remove(struct pci_dev *pdev)
         unregister_netdev(netdev);
 
         if (qlcnic_83xx_check(adapter)) {
-                if (adapter->flags & QLCNIC_MSIX_ENABLED)
-                        qlcnic_83xx_config_intrpt(adapter, 0);
                 qlcnic_83xx_free_mbx_intr(adapter);
                 qlcnic_83xx_register_nic_idc_func(adapter, 0);
                 cancel_delayed_work_sync(&adapter->idc_aen_work);
@@ -3107,8 +3102,6 @@ static pci_ers_result_t qlcnic_io_error_detected(struct pci_dev *pdev,
                 qlcnic_down(adapter, netdev);
 
         if (qlcnic_83xx_check(adapter)) {
-                if (adapter->flags & QLCNIC_MSIX_ENABLED)
-                        qlcnic_83xx_config_intrpt(adapter, 0);
                 qlcnic_83xx_free_mbx_intr(adapter);
                 qlcnic_83xx_register_nic_idc_func(adapter, 0);
                 cancel_delayed_work_sync(&adapter->idc_aen_work);
@@ -3203,13 +3196,11 @@ int qlcnic_set_max_rss(struct qlcnic_adapter *adapter, u8 data, size_t len)
         if (netif_running(netdev))
                 __qlcnic_down(adapter, netdev);
 
-        if (qlcnic_83xx_check(adapter)) {
-                if (adapter->flags & QLCNIC_MSIX_ENABLED)
-                        qlcnic_83xx_config_intrpt(adapter, 0);
+        qlcnic_detach(adapter);
+
+        if (qlcnic_83xx_check(adapter))
                 qlcnic_83xx_free_mbx_intr(adapter);
-        }
 
-        qlcnic_detach(adapter);
         qlcnic_teardown_intr(adapter);
         err = qlcnic_setup_intr(adapter, data);
         if (err) {