From d3e17b2aad55e789cda659b8c592edcf6d80a712 Mon Sep 17 00:00:00 2001
From: Sathya Perla <sathya.perla@emulex.com>
Date: Mon, 24 Oct 2011 02:45:02 +0000
Subject: [PATCH] --- yaml --- r: 266943 b: refs/heads/master c:
 dafc0fe3afa565c88e44f1c243a49ce209f78ba7 h: refs/heads/master i:   266941:
 96cda118659fa1848664c2673ae66af2670ab97f   266939:
 7140ad04c886a0c84f3784395afd1609bd9747ed   266935:
 9311e31607867e66122a94128f7cf576363b8e72   266927:
 ecd63213e39f63e30028cc7cb58e590efa9885dd   266911:
 e926f25048304a7836e1a7bb784900215e1871b7   266879:
 da3d851abd58d6b08a8fa6b5f8e648feebcb42ca v: v3

---
 [refs]                                        |  2 +-
 .../net/ethernet/emulex/benet/be_main.c       | 26 ++++++++++++-------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 832696389cdc..d24294faaa47 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f9449ab76805a2f0e739f5e85a6d9e32d089f1b2
+refs/heads/master: dafc0fe3afa565c88e44f1c243a49ce209f78ba7
diff --git a/trunk/drivers/net/ethernet/emulex/benet/be_main.c b/trunk/drivers/net/ethernet/emulex/benet/be_main.c
index d32e3787beb4..555b0ec3fe5f 100644
--- a/trunk/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/trunk/drivers/net/ethernet/emulex/benet/be_main.c
@@ -1633,6 +1633,17 @@ static void be_tx_queues_destroy(struct be_adapter *adapter)
 	be_queue_free(adapter, q);
 }
 
+static int be_num_txqs_want(struct be_adapter *adapter)
+{
+	if ((num_vfs && adapter->sriov_enabled) ||
+		(adapter->function_mode & 0x400) ||
+		lancer_chip(adapter) || !be_physfn(adapter) ||
+		adapter->generation == BE_GEN2)
+		return 1;
+	else
+		return MAX_TX_QS;
+}
+
 /* One TX event queue is shared by all TX compl qs */
 static int be_tx_queues_create(struct be_adapter *adapter)
 {
@@ -1640,6 +1651,11 @@ static int be_tx_queues_create(struct be_adapter *adapter)
 	struct be_tx_obj *txo;
 	u8 i;
 
+	adapter->num_tx_qs = be_num_txqs_want(adapter);
+	if (adapter->num_tx_qs != MAX_TX_QS)
+		netif_set_real_num_tx_queues(adapter->netdev,
+			adapter->num_tx_qs);
+
 	adapter->tx_eq.max_eqd = 0;
 	adapter->tx_eq.min_eqd = 0;
 	adapter->tx_eq.cur_eqd = 96;
@@ -3180,16 +3196,6 @@ static int be_get_config(struct be_adapter *adapter)
 	if (status)
 		return status;
 
-	if ((num_vfs && adapter->sriov_enabled) ||
-		(adapter->function_mode & 0x400) ||
-		lancer_chip(adapter) || !be_physfn(adapter)) {
-		adapter->num_tx_qs = 1;
-		netif_set_real_num_tx_queues(adapter->netdev,
-			adapter->num_tx_qs);
-	} else {
-		adapter->num_tx_qs = MAX_TX_QS;
-	}
-
 	return 0;
 }