bnx2x: Spread rx buffers between allocated queues

Default number of rx buffers will be divided equally
 between allocated queues. This will decrease amount of
 pre-allocated buffers on systems with multiple CPUs.
 User can override this behavior with ethtool -G.
 Minimum amount of rx buffers per queue set to 128.

Reported-by: Eric Dumazet <eric.dumazet@gmail.com>

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>

1 files changed, 9 insertions, 1 deletions

diff --git a/drivers/net/bnx2x/bnx2x_ethtool.c b/drivers/net/bnx2x/bnx2x_ethtool.c
index 6f939c5a0089..d9748e97fad3 100644
--- a/drivers/net/bnx2x/bnx2x_ethtool.c
+++ b/drivers/net/bnx2x/bnx2x_ethtool.c
@@ -961,7 +961,14 @@ static void bnx2x_get_ringparam(struct net_device *dev,
         ering->rx_mini_max_pending = 0;
         ering->rx_jumbo_max_pending = 0;
 
-        ering->rx_pending = bp->rx_ring_size;
+        if (bp->rx_ring_size)
+                ering->rx_pending = bp->rx_ring_size;
+        else
+                if (bp->state == BNX2X_STATE_OPEN && bp->num_queues)
+                        ering->rx_pending = MAX_RX_AVAIL/bp->num_queues;
+                else
+                        ering->rx_pending = MAX_RX_AVAIL;
+
         ering->rx_mini_pending = 0;
         ering->rx_jumbo_pending = 0;
 
@@ -981,6 +988,7 @@ static int bnx2x_set_ringparam(struct net_device *dev,
         }
 
         if ((ering->rx_pending > MAX_RX_AVAIL) ||
+            (ering->rx_pending < MIN_RX_AVAIL) ||
             (ering->tx_pending > MAX_TX_AVAIL) ||
             (ering->tx_pending <= MAX_SKB_FRAGS + 4))
                 return -EINVAL;