3 files changed, 12 insertions, 7 deletions

diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
index cdcbbb0e40cb..d23372e2a4a3 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
@@ -1239,10 +1239,10 @@ void qlcnic_83xx_register_nic_idc_func(struct qlcnic_adapter *adapter,
 
         if (enable) {
                 qlcnic_alloc_mbx_args(&cmd, adapter, QLCNIC_CMD_INIT_NIC_FUNC);
-                cmd.req.arg[1] = 1 | BIT_0;
+                cmd.req.arg[1] = BIT_0 | BIT_31;
         } else {
                 qlcnic_alloc_mbx_args(&cmd, adapter, QLCNIC_CMD_STOP_NIC_FUNC);
-                cmd.req.arg[1] = 0 | BIT_0;
+                cmd.req.arg[1] = BIT_0 | BIT_31;
         }
         status = qlcnic_issue_cmd(adapter, &cmd);
         if (status)
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
index f6470027d0fc..c53832b02b3e 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
@@ -585,6 +585,9 @@ static int qlcnic_83xx_idc_check_fan_failure(struct qlcnic_adapter *adapter)
 
 static int qlcnic_83xx_idc_reattach_driver(struct qlcnic_adapter *adapter)
 {
+        /* register for NIC IDC AEN Events */
+        qlcnic_83xx_register_nic_idc_func(adapter, 1);
+
         qlcnic_83xx_enable_mbx_intrpt(adapter);
         if ((adapter->flags & QLCNIC_MSIX_ENABLED)) {
                 if (qlcnic_83xx_config_intrpt(adapter, 1)) {
@@ -2025,6 +2028,9 @@ int qlcnic_83xx_init(struct qlcnic_adapter *adapter)
         set_bit(QLC_83XX_MBX_READY, &adapter->ahw->idc.status);
         qlcnic_83xx_clear_function_resources(adapter);
 
+        /* register for NIC IDC AEN Events */
+        qlcnic_83xx_register_nic_idc_func(adapter, 1);
+
         if (!qlcnic_83xx_read_flash_descriptor_table(adapter))
                 qlcnic_83xx_read_flash_mfg_id(adapter);
 
@@ -2041,9 +2047,6 @@ int qlcnic_83xx_init(struct qlcnic_adapter *adapter)
 
         INIT_DELAYED_WORK(&adapter->idc_aen_work, qlcnic_83xx_idc_aen_work);
 
-        /* register for NIC IDC AEN Events */
-        qlcnic_83xx_register_nic_idc_func(adapter, 1);
-
         /* Periodically monitor device status */
         qlcnic_83xx_idc_poll_dev_state(&adapter->fw_work.work);
 
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
index d0aef32d0390..714124abf69a 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
@@ -1174,8 +1174,6 @@ qlcnic_set_mgmt_operations(struct qlcnic_adapter *adapter)
 
         qlcnic_dev_set_npar_ready(adapter);
 
-        if (qlcnic_83xx_check(adapter))
-                qlcnic_83xx_register_nic_idc_func(adapter, 1);
         return err;
 }
 
@@ -3063,6 +3061,8 @@ static int qlcnic_attach_func(struct pci_dev *pdev)
         }
 
         if (qlcnic_83xx_check(adapter)) {
+                /* register for NIC IDC AEN Events */
+                qlcnic_83xx_register_nic_idc_func(adapter, 1);
                 err = qlcnic_83xx_setup_mbx_intr(adapter);
                 if (err) {
                         dev_err(&adapter->pdev->dev,
@@ -3224,6 +3224,8 @@ int qlcnic_set_max_rss(struct qlcnic_adapter *adapter, u8 data, size_t len)
         }
 
         if (qlcnic_83xx_check(adapter)) {
+                /* register for NIC IDC AEN Events */
+                qlcnic_83xx_register_nic_idc_func(adapter, 1);
                 err = qlcnic_83xx_setup_mbx_intr(adapter);
                 if (err) {
                         dev_err(&adapter->pdev->dev,