From: Michael Chan Date: Mon, 29 May 2017 23:06:10 +0000 (-0400) Subject: bnxt_en: Pass in sh parameter to bnxt_set_dflt_rings(). X-Git-Tag: v4.1.12-106.0.20170710_2300~21 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=5717cb9193075593c7439b8063465eb6dc261f12;p=users%2Fjedix%2Flinux-maple.git bnxt_en: Pass in sh parameter to bnxt_set_dflt_rings(). Orabug: 26402533, 26325599, 26366387 In the existing code, the local variable sh is hardcoded to true to calculate default rings for shared ring configuration. It is better to have the caller determine the value of sh. Reported-by: Gustavo A. R. Silva Signed-off-by: Michael Chan Signed-off-by: David S. Miller (cherry picked from commit 702c221ca64060b81af4461553be19cba275da8b) Signed-off-by: Brian Maly Signed-off-by: Somasundaram Krishnasamy --- diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c index ff6b2a1958d9..5815db7fd938 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -7636,10 +7636,9 @@ static int bnxt_get_dflt_rings(struct bnxt *bp, int *max_rx, int *max_tx, return rc; } -static int bnxt_set_dflt_rings(struct bnxt *bp) +static int bnxt_set_dflt_rings(struct bnxt *bp, bool sh) { int dflt_rings, max_rx_rings, max_tx_rings, rc; - bool sh = true; if (sh) bp->flags |= BNXT_FLAG_SHARED_RINGS; @@ -7811,7 +7810,7 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) bnxt_set_tpa_flags(bp); bnxt_set_ring_params(bp); bnxt_set_max_func_irqs(bp, max_irqs); - rc = bnxt_set_dflt_rings(bp); + rc = bnxt_set_dflt_rings(bp, true); if (rc) { netdev_err(bp->dev, "Not enough rings available.\n"); rc = -ENOMEM;