net-next: vmxnet3 fixes [2/5] Interrupt control bitmap

A new bit map 'intrCtrl' is introduced in the DriverShared area. The 
driver should update VMXNET3_IC_DISABLE_ALL bit before writing IMR.

Signed-off-by: Ronghua Zang <ronghua@vmware.com>
Signed-off-by: Shreyas Bhatewara <sbhatewara@vmware.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 5 insertions, 0 deletions

diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c
index 989b742551ac..0fbfc67e0f79 100644
--- a/drivers/net/vmxnet3/vmxnet3_drv.c
+++ b/drivers/net/vmxnet3/vmxnet3_drv.c
@@ -72,6 +72,8 @@ vmxnet3_enable_all_intrs(struct vmxnet3_adapter *adapter)
 
         for (i = 0; i < adapter->intr.num_intrs; i++)
                 vmxnet3_enable_intr(adapter, i);
+        adapter->shared->devRead.intrConf.intrCtrl &=
+                                        cpu_to_le32(~VMXNET3_IC_DISABLE_ALL);
 }
 
 
@@ -80,6 +82,8 @@ vmxnet3_disable_all_intrs(struct vmxnet3_adapter *adapter)
 {
         int i;
 
+        adapter->shared->devRead.intrConf.intrCtrl |=
+                                        cpu_to_le32(VMXNET3_IC_DISABLE_ALL);
         for (i = 0; i < adapter->intr.num_intrs; i++)
                 vmxnet3_disable_intr(adapter, i);
 }
@@ -1825,6 +1829,7 @@ vmxnet3_setup_driver_shared(struct vmxnet3_adapter *adapter)
                 devRead->intrConf.modLevels[i] = adapter->intr.mod_levels[i];
 
         devRead->intrConf.eventIntrIdx = adapter->intr.event_intr_idx;
+        devRead->intrConf.intrCtrl |= cpu_to_le32(VMXNET3_IC_DISABLE_ALL);
 
         /* rx filter settings */
         devRead->rxFilterConf.rxMode = 0;