diff options
| author |   Michael Chan <michael.chan@broadcom.com> | 2017-04-04 18:14:17 -0400 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-04-05 06:24:26 -0700 |
| commit | 68a946bb81e07ed0e59a99e0c068d091ed42cc1b (patch) | |
| tree | a37ea7149a4eb66b7a8335a55a12685738c7ea4e /drivers/net/ethernet/broadcom | |
| parent | bnxt_en: Use short TX BDs for the XDP TX ring. (diff) | |
| download | linux-dev-68a946bb81e07ed0e59a99e0c068d091ed42cc1b.tar.xz linux-dev-68a946bb81e07ed0e59a99e0c068d091ed42cc1b.zip | |
bnxt_en: Cap the msix vector with the max completion rings.
The current code enables up to the maximum MSIX vectors in the PCIE
config space without considering the max completion rings available.
An MSIX vector is only useful when it has an associated completion
ring, so it is better to cap it.
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom')
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnxt/bnxt.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c index 9d71c19f5496..43b7342c6e82 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -5183,9 +5183,10 @@ static unsigned int bnxt_get_max_func_irqs(struct bnxt *bp) { #if defined(CONFIG_BNXT_SRIOV) if (BNXT_VF(bp)) - return bp->vf.max_irqs; + return min_t(unsigned int, bp->vf.max_irqs, + bp->vf.max_cp_rings); #endif - return bp->pf.max_irqs; + return min_t(unsigned int, bp->pf.max_irqs, bp->pf.max_cp_rings); } void bnxt_set_max_func_irqs(struct bnxt *bp, unsigned int max_irqs) |