From: Dmitry Kravkov <dmitry@broadcom.com>
Date: Mon, 23 Jan 2012 07:31:54 +0000 (+0000)
Subject: bnx2x: allow user to change ring size in ISCSI SD mode
X-Git-Tag: v2.6.39-400.9.0~423^2~19^2~11^2~508
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=781fbe1443e5e3f85e347546eb12661fc28c47e9;p=users%2Fjedix%2Flinux-maple.git

bnx2x: allow user to change ring size in ISCSI SD mode

(cherry picked from commit 1fdf155158886514c82e5401ab7b1264beb375bf)
Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Joe Jin <joe.jin@oracle.com>
---

diff --git a/drivers/net/bnx2x/bnx2x_cmn.c b/drivers/net/bnx2x/bnx2x_cmn.c
index f4a95a89ddc60..cf46e23f1b7bb 100644
--- a/drivers/net/bnx2x/bnx2x_cmn.c
+++ b/drivers/net/bnx2x/bnx2x_cmn.c
@@ -3079,7 +3079,7 @@ static int bnx2x_alloc_fp_mem_at(struct bnx2x *bp, int index)
 	int rx_ring_size = 0;
 
 #ifdef BCM_CNIC
-	if (IS_MF_ISCSI_SD(bp)) {
+	if (!bp->rx_ring_size && IS_MF_ISCSI_SD(bp)) {
 		rx_ring_size = MIN_RX_SIZE_NONTPA;
 		bp->rx_ring_size = rx_ring_size;
 	} else