Merge tag 'v3.10.107' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / net / ethernet / broadcom / bnx2x / bnx2x_ethtool.c

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
index ce1a91618677c13e232f4b017485722857e35520..9c19f49f0f54d676846b3d0bc678be782ce02dea 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
@@ -1792,8 +1792,16 @@ static void bnx2x_get_ringparam(struct net_device *dev,
 
        ering->rx_max_pending = MAX_RX_AVAIL;
 
+       /* If size isn't already set, we give an estimation of the number
+        * of buffers we'll have. We're neglecting some possible conditions
+        * [we couldn't know for certain at this point if number of queues
+        * might shrink] but the number would be correct for the likely
+        * scenario.
+        */
        if (bp->rx_ring_size)
                ering->rx_pending = bp->rx_ring_size;
+       else if (BNX2X_NUM_RX_QUEUES(bp))
+               ering->rx_pending = MAX_RX_AVAIL / BNX2X_NUM_RX_QUEUES(bp);
        else
                ering->rx_pending = MAX_RX_AVAIL;