From: Michael Chan <michael.chan@broadcom.com>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org
Subject: [PATCH net-next 09/11] bnxt_en: Allow promiscuous mode for VF if default VLAN is enabled.
Date: Fri, 1 Jul 2016 18:46:27 -0400 [thread overview]
Message-ID: <1467413189-29566-10-git-send-email-michael.chan@broadcom.com> (raw)
In-Reply-To: <1467413189-29566-1-git-send-email-michael.chan@broadcom.com>
With a default VLAN, the VF has its own VLAN domain and it can receive
all traffic within that domain.
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
---
drivers/net/ethernet/broadcom/bnxt/bnxt.c | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 9134268..2740ac3 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -4316,6 +4316,16 @@ static int bnxt_alloc_rfs_vnics(struct bnxt *bp)
#endif
}
+/* Allow PF and VF with default VLAN to be in promiscuous mode */
+static bool bnxt_promisc_ok(struct bnxt *bp)
+{
+#ifdef CONFIG_BNXT_SRIOV
+ if (BNXT_VF(bp) && !bp->vf.vlan)
+ return false;
+#endif
+ return true;
+}
+
static int bnxt_cfg_rx_mode(struct bnxt *);
static bool bnxt_mc_list_updated(struct bnxt *, u32 *);
@@ -4381,7 +4391,7 @@ static int bnxt_init_chip(struct bnxt *bp, bool irq_re_init)
vnic->rx_mask = CFA_L2_SET_RX_MASK_REQ_MASK_BCAST;
- if ((bp->dev->flags & IFF_PROMISC) && BNXT_PF(bp))
+ if ((bp->dev->flags & IFF_PROMISC) && bnxt_promisc_ok(bp))
vnic->rx_mask |= CFA_L2_SET_RX_MASK_REQ_MASK_PROMISCUOUS;
if (bp->dev->flags & IFF_ALLMULTI) {
@@ -5528,8 +5538,7 @@ static void bnxt_set_rx_mode(struct net_device *dev)
CFA_L2_SET_RX_MASK_REQ_MASK_MCAST |
CFA_L2_SET_RX_MASK_REQ_MASK_ALL_MCAST);
- /* Only allow PF to be in promiscuous mode */
- if ((dev->flags & IFF_PROMISC) && BNXT_PF(bp))
+ if ((dev->flags & IFF_PROMISC) && bnxt_promisc_ok(bp))
mask |= CFA_L2_SET_RX_MASK_REQ_MASK_PROMISCUOUS;
uc_update = bnxt_uc_list_updated(bp);
--
1.8.3.1
next prev parent reply other threads:[~2016-07-01 22:46 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-01 22:46 [PATCH net-next 00/11] bnxt_en updates for net-next Michael Chan
2016-07-01 22:46 ` [PATCH net-next 01/11] bnxt_en: VF/NPAR should return -EOPNOTSUPP for unsupported ethtool ops Michael Chan
2016-07-01 22:46 ` [PATCH net-next 02/11] bnxt_en: Update firmware spec. to 1.3.0 Michael Chan
2016-07-01 22:46 ` [PATCH net-next 03/11] bnxt_en: Do function reset on the 1st PF open only Michael Chan
2016-07-01 22:46 ` [PATCH net-next 04/11] bnxt_en: Add support for updating flash more securely Michael Chan
2016-07-01 22:46 ` [PATCH net-next 05/11] bnxt_en: Request firmware reset after successful firwmare update Michael Chan
2016-07-01 22:46 ` [PATCH net-next 06/11] bnxt_en: Add support for firmware updates for additional processors Michael Chan
2016-07-01 22:46 ` [PATCH net-next 07/11] bnxt_en: Enable MRU enables bit when configuring VNIC MRU Michael Chan
2016-07-01 22:46 ` [PATCH net-next 08/11] bnxt_en: Increase maximum supported MTU to 9500 Michael Chan
2016-07-01 22:46 ` Michael Chan [this message]
2016-07-01 22:46 ` [PATCH net-next 10/11] bnxt_en: Assign netdev->dev_port with port ID Michael Chan
2016-07-01 22:46 ` [PATCH net-next 11/11] bnxt_en: Allow statistics DMA to be configurable using ethtool -C Michael Chan
2016-07-02 18:55 ` [PATCH net-next 00/11] bnxt_en updates for net-next David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1467413189-29566-10-git-send-email-michael.chan@broadcom.com \
--to=michael.chan@broadcom.com \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).