From 9fb702034cfcb2c38ec26e4cedbc467e0415f1b3 Mon Sep 17 00:00:00 2001
From: Mintz Yuval <yuvalmin@broadcom.com>
Date: Wed, 15 Feb 2012 02:10:28 +0000
Subject: [PATCH] --- yaml --- r: 290151 b: refs/heads/master c:
 d760fc37b0f74502b3f748951f22c6683b079a8e h: refs/heads/master i:   290149:
 e41e08f5fd411df04d6a6a9f689c8dd10d4766df   290147:
 e061285801b5ce290128ef2e7fe2ae6addbe0318   290143:
 faf768adbab34b6ed0ef82b6094ff150e55efb33 v: v3

---
 [refs]                                                | 2 +-
 trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 985cd2ce80ba..76bbbf34656b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: afa13b4b94bc4b3247fa46dd8698c8dbfe1a615c
+refs/heads/master: d760fc37b0f74502b3f748951f22c6683b079a8e
diff --git a/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
index 7f6a1b1be74d..5d15efc2a9e2 100644
--- a/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
+++ b/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
@@ -3122,9 +3122,16 @@ static int bnx2x_alloc_fp_mem_at(struct bnx2x *bp, int index)
 	} else
 #endif
 	if (!bp->rx_ring_size) {
+		u32 cfg = SHMEM_RD(bp,
+			     dev_info.port_hw_config[BP_PORT(bp)].default_cfg);
 
 		rx_ring_size = MAX_RX_AVAIL/BNX2X_NUM_RX_QUEUES(bp);
 
+		/* Dercease ring size for 1G functions */
+		if ((cfg & PORT_HW_CFG_NET_SERDES_IF_MASK) ==
+		    PORT_HW_CFG_NET_SERDES_IF_SGMII)
+			rx_ring_size /= 10;
+
 		/* allocate at least number of buffers required by FW */
 		rx_ring_size = max_t(int, bp->disable_tpa ? MIN_RX_SIZE_NONTPA :
 				     MIN_RX_SIZE_TPA, rx_ring_size);