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

Commit 11c3ec7b authored by Michael Chan's avatar Michael Chan Committed by David S. Miller
Browse files

bnxt_en: Need to include RDMA rings in bnxt_check_rings(). 



With recent changes to reserve both L2 and RDMA rings, we need to include
the RDMA rings in bnxt_check_rings().  Otherwise we will under-estimate
the rings we need during ethtool -L and may lead to failure.

Fixes: fbcfc8e4 ("bnxt_en: Reserve completion rings and MSIX for bnxt_re RDMA driver.")
Signed-off-by: default avatarMichael Chan <michael.chan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9d96465b

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

+2 −0
Original line number Diff line number Diff line
@@ -7686,6 +7686,8 @@ int bnxt_check_rings(struct bnxt *bp, int tx, int rx, bool sh, int tcs, 
	if (bp->flags & BNXT_FLAG_AGG_RINGS)

		rx_rings <<= 1;

	cp = sh ? max_t(int, tx_rings_needed, rx) : tx_rings_needed + rx;

	if (bp->flags & BNXT_FLAG_NEW_RM)

		cp += bnxt_get_ulp_msix_num(bp);

	return bnxt_hwrm_check_rings(bp, tx_rings_needed, rx_rings, rx, cp,

				     vnics);

}