]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
bnxt_en: Don't fallback to INTA on VF.
authorMichael Chan <michael.chan@broadcom.com>
Mon, 25 Apr 2016 06:30:49 +0000 (02:30 -0400)
committerChuck Anderson <chuck.anderson@oracle.com>
Thu, 7 Jul 2016 00:37:07 +0000 (17:37 -0700)
Orabug: 23221795

Only MSI-X can be used on a VF.  The driver should fail initialization
if it cannot successfully enable MSI-X.

Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit 1fa72e29e14d97fbda15437c648d7cc4eb00bff8)
Signed-off-by: Brian Maly <brian.maly@oracle.com>
drivers/net/ethernet/broadcom/bnxt/bnxt.c

index 72855e6d954175f465223c3e155d03bddd437ab4..33a06e4b0f5d3d5a2601018ea61003bda989cca5 100644 (file)
@@ -4326,7 +4326,7 @@ static int bnxt_setup_int_mode(struct bnxt *bp)
        if (bp->flags & BNXT_FLAG_MSIX_CAP)
                rc = bnxt_setup_msix(bp);
 
-       if (!(bp->flags & BNXT_FLAG_USING_MSIX)) {
+       if (!(bp->flags & BNXT_FLAG_USING_MSIX) && BNXT_PF(bp)) {
                /* fallback to INTA */
                rc = bnxt_setup_inta(bp);
        }