Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 702c221c authored by Michael Chan's avatar Michael Chan Committed by David S. Miller
Browse files

bnxt_en: Pass in sh parameter to bnxt_set_dflt_rings(). 



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: default avatarGustavo A. R. Silva <garsilva@embeddedor.com>
Signed-off-by: default avatarMichael Chan <michael.chan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4d172f21

drivers/net/ethernet/broadcom/bnxt/bnxt.c

+2 −3
Original line number Diff line number Diff line
@@ -7567,10 +7567,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;
@@ -7749,7 +7748,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;