From 7bbeb2a4d98bb54212f9feac4cd2a3233ee2303a Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen@networkplumber.org>
Date: Tue, 15 Jan 2013 07:28:33 +0000
Subject: [PATCH] --- yaml --- r: 351423 b: refs/heads/master c:
 4db37a78561c4f6ff54176257b3098f3d4357759 h: refs/heads/master i:   351421:
 c8632bf8397914d6f1a575857aae8963a1867180   351419:
 1ec5300ada50053572b312d302136f5d7be50b0f   351415:
 b1219e758ccfd5b219bb514472d51b9e18ced46d   351407:
 8b6a0a9bb44a2dd418856485c1a6b77e75fb09f0   351391:
 cdc021acde2da2649360fceb6459bcb03df7c9ec   351359:
 69dc7623760bee4f15a3096616a328cb80df3c19 v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/net/vmxnet3/vmxnet3_drv.c | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 8e3e05428a17..5e17cfe45e0d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f32a2605bbf9a42884b11e222d208ae0372f6d89
+refs/heads/master: 4db37a78561c4f6ff54176257b3098f3d4357759
diff --git a/trunk/drivers/net/vmxnet3/vmxnet3_drv.c b/trunk/drivers/net/vmxnet3/vmxnet3_drv.c
index 1f66a7e3c25f..45c39cc4da47 100644
--- a/trunk/drivers/net/vmxnet3/vmxnet3_drv.c
+++ b/trunk/drivers/net/vmxnet3/vmxnet3_drv.c
@@ -44,7 +44,6 @@ static DEFINE_PCI_DEVICE_TABLE(vmxnet3_pciid_table) = {
 MODULE_DEVICE_TABLE(pci, vmxnet3_pciid_table);
 
 static int enable_mq = 1;
-static int irq_share_mode;
 
 static void
 vmxnet3_write_mac_addr(struct vmxnet3_adapter *adapter, u8 *mac);
@@ -3003,9 +3002,9 @@ vmxnet3_probe_device(struct pci_dev *pdev,
 	SET_NETDEV_DEV(netdev, &pdev->dev);
 	vmxnet3_declare_features(adapter, dma64);
 
-	adapter->share_intr = irq_share_mode;
-	if (adapter->share_intr == VMXNET3_INTR_BUDDYSHARE &&
-	    adapter->num_tx_queues != adapter->num_rx_queues)
+	if (adapter->num_tx_queues == adapter->num_rx_queues)
+		adapter->share_intr = VMXNET3_INTR_BUDDYSHARE;
+	else
 		adapter->share_intr = VMXNET3_INTR_DONTSHARE;
 
 	vmxnet3_alloc_intr_resources(adapter);