From: Michael Chan Date: Mon, 13 Feb 2017 00:18:13 +0000 (-0500) Subject: bnxt_en: Allow NETIF_F_NTUPLE to be enabled on VFs. X-Git-Tag: v4.1.12-93~2^2~11 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b3c81d424aecc1dc8844f237d9a0c4627a44e0f9;p=users%2Fjedix%2Flinux-maple.git bnxt_en: Allow NETIF_F_NTUPLE to be enabled on VFs. Orabug: 25645429 Commit ae10ae740ad2 ("bnxt_en: Add new hardware RFS mode.") has added code to allow NTUPLE to be enabled on VFs. So we now remove the BNXT_VF() check in rfs_capable() to allow NTUPLE on VFs. Signed-off-by: Michael Chan Signed-off-by: David S. Miller (cherry picked from commit 964fd4801d40ead69a447482c0dd0cd4be495e47) Signed-off-by: Brian Maly --- diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c index a7a12d59d425..833be54d7126 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -6287,7 +6287,7 @@ static bool bnxt_rfs_capable(struct bnxt *bp) #ifdef CONFIG_RFS_ACCEL int vnics, max_vnics, max_rss_ctxs; - if (BNXT_VF(bp) || !(bp->flags & BNXT_FLAG_MSIX_CAP)) + if (!(bp->flags & BNXT_FLAG_MSIX_CAP)) return false; vnics = 1 + bp->rx_nr_rings;