Commit 409e8ec8 authored by Ronak Doshi's avatar Ronak Doshi Committed by David S. Miller
Browse files

vmxnet3: use correct intrConf reference when using extended queues 



Commit 39f9895a ("vmxnet3: add support for 32 Tx/Rx queues")
added support for 32Tx/Rx queues. As a part of this patch, intrConf
structure was extended to incorporate increased queues.

This patch fixes the issue where incorrect reference is being used.

Fixes: 39f9895a ("vmxnet3: add support for 32 Tx/Rx queues")
Signed-off-by: default avatarRonak Doshi <doshir@vmware.com>
Acked-by: default avatarGuolin Yang <gyang@vmware.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 40b8c2a1

drivers/net/vmxnet3/vmxnet3_drv.c

+14 −2
Original line number Diff line number Diff line
@@ -75,8 +75,14 @@ vmxnet3_enable_all_intrs(struct vmxnet3_adapter *adapter) 


	for (i = 0; i < adapter->intr.num_intrs; i++)

		vmxnet3_enable_intr(adapter, i);

	if (!VMXNET3_VERSION_GE_6(adapter) ||

	    !adapter->queuesExtEnabled) {

		adapter->shared->devRead.intrConf.intrCtrl &=

					cpu_to_le32(~VMXNET3_IC_DISABLE_ALL);

	} else {

		adapter->shared->devReadExt.intrConfExt.intrCtrl &=

					cpu_to_le32(~VMXNET3_IC_DISABLE_ALL);

	}

}
@@ -85,8 +91,14 @@ vmxnet3_disable_all_intrs(struct vmxnet3_adapter *adapter) 
{

	int i;



	if (!VMXNET3_VERSION_GE_6(adapter) ||

	    !adapter->queuesExtEnabled) {

		adapter->shared->devRead.intrConf.intrCtrl |=

					cpu_to_le32(VMXNET3_IC_DISABLE_ALL);

	} else {

		adapter->shared->devReadExt.intrConfExt.intrCtrl |=

					cpu_to_le32(VMXNET3_IC_DISABLE_ALL);

	}

	for (i = 0; i < adapter->intr.num_intrs; i++)

		vmxnet3_disable_intr(adapter, i);

}